Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change: additional arguments/assertions for UC24 and OEM 24.04 via Zapper KVM #324

Merged
merged 6 commits into from
Aug 9, 2024

Conversation

p-gentili
Copy link
Contributor

@p-gentili p-gentili commented Aug 6, 2024

Description

This PR addresses a few problems detected while provisioning a device with UC24-subiquity and Desktop 24.04 OEM.

About UC24:

  • being a non-dangerous grade image, the installed user will be given by ubuntu_sso_email. This PR forwards the ubuntu_sso_email argument to the zapper.provision() API and assert that test_username matches the local part of the SSO email. The DUT pulls TF SSH key from the account, so it's accessible and reservation works fine.

About 24.04 OEM:

  • user_data_base was intended as a plain string, making it difficult to include in a TF job yaml. Taking inspiration from the MAAS connector I made it a base64 encoded field. Added tests and assertions.
  • being a common case, instead of asking the user to pass the user_data_base argument, I added a dedicated autoinstall_oem boolean flag. It will be handled on the Zapper side as described in the autoinstall docs. See https://github.com/canonical/zapper/pull/311 for reference on what it actually does on the Zapper side.

Resolved issues

Resolves ZAP-873
Part of ZAP-776

Documentation

Updated README and docs/.

Web service API changes

N/A

Tests

About UC24: couldn't really test it e2e but, once manually provisioned via Zapper API, the device is accessible as usual by TF with:

~ cat uc24.yaml       
job_queue: 202101-28611
**test_data:
  test_username: ce-certification-qa**
reserve_data:
  ssh_keys:
    - lp:pgentili

About 24.04 OEM: tested on the Zapper side as part of https://github.com/canonical/zapper/pull/311 passing oem=True.

@p-gentili p-gentili requested a review from plars August 6, 2024 09:04
Copy link
Collaborator

@plars plars left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, looks really great! Just a couple of comments

@p-gentili p-gentili force-pushed the fix-zapperkvm-uc24-oem24.04 branch from 581686f to e1fda87 Compare August 9, 2024 09:15
Copy link
Collaborator

@plars plars left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent! looks good, +1

@p-gentili p-gentili merged commit 89998d1 into main Aug 9, 2024
5 checks passed
@p-gentili p-gentili deleted the fix-zapperkvm-uc24-oem24.04 branch August 9, 2024 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants