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

Apply dom0 state as part of updater #458

Merged
merged 2 commits into from
Feb 18, 2020
Merged

Apply dom0 state as part of updater #458

merged 2 commits into from
Feb 18, 2020

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Feb 17, 2020

Status

Ready for review

Description of Changes

Fixes #427

Applied dom0 salt state after applying VM upgrades. The reason it was done as part of the UpgradeThread thread is to ensure the user has consented to applying upgrades. It is also done after to ensure changes to dom0 config packages are applied.

Testing

  • Ensure at least 1 VM needs updates (due to changes in apt server logic, it may be less easy to downgrade packages, I had to install a locally-built securedrop-client deb in sd-app-buster-template to ensure the apt server can update to the latest nightly version
  • dom0 configuration is applied after upgrades are applied to VMs
  • test coverage for Updater.py is 100%

Checklist

If you have made changes to the provisioning logic

  • Linting (make flake8) and tests (make test) pass in dom0 of a Qubes install

@conorsch
Copy link
Contributor

@emkll Merge of #450 introduced conflicts here, mind rebasing?

@emkll emkll force-pushed the 427-apply-dom0-state branch from 85560c0 to b341f9e Compare February 18, 2020 18:30
@emkll
Copy link
Contributor Author

emkll commented Feb 18, 2020

rebased on latest master

@conorsch conorsch self-requested a review February 18, 2020 18:45
@conorsch
Copy link
Contributor

Taking for a spin, will downgrade some packages prior to testing...

Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

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

Works as advertised. Confirmed dom0 update landed in logs, and monitored for qubesctl highstate process during the provisioning run.

@conorsch conorsch merged commit 616f109 into master Feb 18, 2020
@eloquence eloquence mentioned this pull request Feb 19, 2020
9 tasks
cfm pushed a commit that referenced this pull request Apr 1, 2024
@legoktm legoktm deleted the 427-apply-dom0-state branch May 28, 2024 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Enforce dom0 salt state as part of preflight updates
2 participants