Have dev default to nightlies, use qa-switch for release candidates #783
Conversation
* `make dev` now defaults to installing nightlies, which restores the old behavior before the apt-test component split. * Running qa-switch will now configure templates to use the "main" component, which is where release candidates go. * Fix the list of templates that qa-switch modifies, so it actually works. Co-authored-by: Cory Francis Myers <[email protected]>
* `s/buster/bullseye/g` * `s/f25/f32/g` Co-authored-by: Cory Francis Myers <[email protected]>
legoktm
changed the title
|
Thanks, @legoktm! I'll pick this up on Monday for review on fresh Qubes 4.1. ( |
There was a problem hiding this comment.
Partial test with partial prerequisites:
- The first commit can be tested with buster or bullseye
- while the second requires the bullseye template etc. to be available.
First make dev
Once fedora-35 has been installed, several states fail with:
qvm-clone: error: no such domain: 'fedora-35-dvm'
Second make dev
Can observe fedora-35-dvm being created. Failed due to needing to reapply https://forum.qubes-os.org/t/ax210-211-wifi-card-not-showing-any-networks/9498/11 in fedora-35 once the basis for sys-net.
Third make dev
/usr/share/securedrop-workstation-dom0-config/scripts/provision-all fails with:
ID: sd-viewer-install-metapackage
Function: pkg.installed
Result: False
Comment: Problem encountered installing package(s). Additional info follows:
errors:
- Running scope as unit: run-r4899b96ecf4c4affbae0fe312d932722.scope
E: Unable to locate package securedrop-workstation-viewer
Started: 15:47:25.014850
Duration: 816.879 ms
Changes:-
securedrop-debian-packagingis missing a CircleCI job to build thesecuredrop-workstation-viewernightly. → ci: buildsecuredrop-workstation-viewerrather than-svs-dispsecuredrop-builder#342
- Follow the steps outlined above. In between each step check
/etc/apt/sources.list.d/securedrop_workstation.listto see the correct component is being used. (note that you might need to manually restart appVMs to see the templateVM change take effect)
[cfm@dom0 securedrop-workstation]$ qvm-run --pass-io sd-large-buster-template "cat /etc/apt/sources.list.d/securedrop_workstation.list"
deb [arch=amd64] https://apt-test.freedom.press/ buster nightlies
[cfm@dom0 securedrop-workstation]$ qvm-run --pass-io sd-small-buster-template "cat /etc/apt/sources.list.d/securedrop_workstation.list"
deb [arch=amd64] https://apt-test.freedom.press/ buster nightliesNext steps
- ci: build
securedrop-workstation-viewerrather than-svs-dispsecuredrop-builder#342 - Will plan to retest tomorrow afternoon (Pacific) with
f32bullseye template once available.
Next steps
Regarding this last step: once freedomofpress/securedrop-yum-test#34 is merged, the |
There was a problem hiding this comment.
- The first commit can be tested with buster or bullseye
- while the second requires the bullseye template etc. to be available.
As of f523cb6, with all buster nightlies available, make dev passes. However, even with the f32 bullseye template available, we can't meaningfully test ./qa-switch.sh until make dev installs from bullseye nightlies. Conferring with @eaon about how to converge these two efforts.
|
After discussing this with all involved parties, because of the work that is still required to make SDW on 4.1 use bullseye templates, we opted to take the first commit of this PR and leave the |
Status
Ready for review
Description of Changes
make devnow installs with nightlies ("nightlies" component on apt-test)qa-switch.shto switch to release candidates ("main" component on apt-test)make devto switch backThis was done by pairing with @cfm.
Testing
/etc/apt/sources.list.d/securedrop_workstation.listto see the correct component is being used. (note that you might need to manually restart appVMs to see the templateVM change take effect)Deployment
Any special considerations for deployment? Should be a no-op for prod instances.
Checklist
make test) pass indom0