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.

Sign up for GitHub

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

Jump to bottom

Update 4.1 SDW to use Fedora-39 #1000

Merged
merged 3 commits into from
May 1, 2024
Merged

Update 4.1 SDW to use Fedora-39 #1000

merged 3 commits into from
May 1, 2024

Conversation

zenmonkeykstop
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop commented Apr 24, 2024 •
edited by deeplow

Status

Ready for review

Description of Changes

Fixes #975

  • updates fedora templates in use by sys* VMs to fedora-39 variants.
  • adds workstation CI config file
  • updates yum-test key.

Testing

Prep

Build an RPM from this branch with make build-rpm, and copy it to dom0 for use with test plans below.

Fresh install (prodlike install)

Qubes 4.1.2 expected, please note hardware

Prep:

Testing:

  • RPM installs successfully in dom0
  • with config in place, sdw-admin --apply completes successfully
  • fedora-39 wis installed as part of --apply run
  • sys-* AppVMs use fedora-39 versions of their expected templates
  • basic client functionality requiring network access (login, first sync) completed successfully.
  • basic client functionality requiring USB support (export, print) completed successfully

Upgrade from 0.10.0 (no fedora-39 templates preinstalled)

Qubes 4.1.2 expected, please note hardware

Testing:

  • RPM installs succesfully via sudo dnf install <name> in dom0, replacing the existing 0.10.0 rpm
  • with config in place, sdw-admin --apply completes successfully
  • fedora-39 wis installed as part of --apply run
  • sys-* AppVMs use fedora-39 versions of their expected templates
  • basic client functionality requiring network access (login, first sync) completed successfully.
  • basic client functionality requiring USB support (export, print) completed successfully

Upgrade from 0.10.0 (with fedora-39 templates preinstalled)

Qubes 4.1.2 expected, please note hardware

Testing:

  • RPM installs succesfully via sudo dnf install <name> in dom0, replacing the existing 0.10.0 rpm
  • with config in place, sdw-admin --apply completes successfully
  • fedora-39 wis installed as part of --apply run
  • sys-* AppVMs use fedora-39 versions of their expected templates
  • basic client functionality requiring network access (login, first sync) completed successfully.
  • basic client functionality requiring USB support (export, print) completed successfully

legoktm and others added 3 commits April 22, 2024 15:38
@legoktm @zenmonkeykstop
Tell workstation-ci which Qubes version to use for tests
f7b5448 
As we move towards 4.2, we'll still have a 4.1 branch for backports,
so the CI runner needs to know which Qubes version to test against.
Having this file will tell it what to do and avoids us from needing
special branch prefixes and is hopefully future-proof.

Refs <freedomofpress/infrastructure#4603 (comment)>.

(cherry picked from commit ff56cbd)
@zenmonkeykstop
Update fedora version to fedora-39
80fe7ec
@cfm @zenmonkeykstop
chore: update apt-test signing key
6500353 
(cherry picked from commit caf6569)
@zenmonkeykstop zenmonkeykstop changed the title 4dot1 f39 bump Update 4.1 SDW to use Fedora-39 Apr 24, 2024
@zenmonkeykstop
Copy link
Contributor Author

The sd-ci-runner failure seems to be related to an issue with downloading the base template RPM - I can replicate on a Qubes 4.1 machine. The test signing key was recently rotated, it looks like the RPM was re-signed as well but for some reason qubes-dom0-update is barfing on it.

The prod template and key are unchanged however - the test plan refers to prod setups so it should be possible to do QA on that basis.

@eloquence
Copy link
Member

(Taking fresh install scenario.)

@eloquence
Copy link
Member

Q: Is this intentionally targeting the release/0.10.0 branch (previous release)?

@zenmonkeykstop zenmonkeykstop changed the base branch from release/0.10.0 to release/0.11.0 April 25, 2024 19:32
@zenmonkeykstop
Copy link
Contributor Author

No, it should have been 0.11.0, good catch.

@deeplow
Copy link
Contributor

deeplow commented Apr 25, 2024 •
edited

I have tested this on the "Upgrade from 0.10.0 (no fedora-39 templates preinstalled)" path. Missing successful login / print tests. Only skipped printing because I do not have that setup.

Framework laptop.

@eloquence
Copy link
Member

eloquence commented Apr 25, 2024 •
edited

All good on fresh install (Qubes 4.1.2, T480, staging run with RPM built from this branch). Can't test print (no supported printer) but export works; printer dialog/check also comes up. Boxes checked directly in test plan.

@eloquence
Copy link
Member

(Test plan seems to be duplicated in release ticket; have checked it off there as well.)

eloquence
eloquence approved these changes May 1, 2024
View reviewed changes
Copy link
Member

@eloquence eloquence left a comment

Choose a reason for hiding this comment

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

LGTM, per chat with Kev we'll test the final scenario during preflight.

@eloquence eloquence merged commit fe77ecf into release/0.11.0 May 1, 2024
6 of 7 checks passed
@eloquence eloquence deleted the 4dot1-f39-bump branch May 1, 2024 16:58
@eloquence
Copy link
Member

(Per quick chat, treating SDW CI fail as unrelated to this PR which has been independently QA'd.)

@cfm cfm mentioned this pull request May 3, 2024
Closed
26 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eloquence eloquence eloquence approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@zenmonkeykstop @eloquence @deeplow @legoktm @cfm