Skip to content

Conversation

@sunshowers
Copy link
Contributor

@sunshowers sunshowers commented Aug 27, 2025

Expand the set of gates for adds/updates to include the fact that zone image sources should be known. Add tests for this:

  • cmds-mupdate-update-flow contains the bulk of testing for this scenario.
  • I had to make tweaks to some tests, particularly to cmds-target-release.txt, in order to start running the test in earnest from the Artifact state rather than the InstallDataset state.

Depends on:

Closes #8726.

Created using spr 1.3.6-beta.1

[skip ci]
Created using spr 1.3.6-beta.1
@sunshowers
Copy link
Contributor Author

Need to update the planner tests.

Created using spr 1.3.6-beta.1

[skip ci]
Created using spr 1.3.6-beta.1
@sunshowers sunshowers marked this pull request as ready for review August 28, 2025 18:33
@sunshowers sunshowers changed the title [2/n] [reconfigurator-planning] gate adds/updates on zone image sources being known [5/n] [reconfigurator-planning] gate adds/updates on zone image sources being known Aug 28, 2025
Created using spr 1.3.6-beta.1

[skip ci]
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1

[skip ci]
Created using spr 1.3.6-beta.1
Copy link
Contributor

@jgallagher jgallagher left a comment

Choose a reason for hiding this comment

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

Changes LGTM, just a tiny nit on one of the tests. Sorry for the unreasonable delay on this review!




> # The above run would have triggered an SP update, which we should delete (we want to start
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure how much this matters, but technically the above plan scheduled an RoT update, not SP. Maybe

Suggested change
> # The above run would have triggered an SP update, which we should delete (we want to start
> # The above blueprint includes a pending MGS update, which we should delete (we want to start

(I also wonder if delete-sp-update should be delete-mgs-update? Happy to file an issue to fix that up separately if you agree.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated!

pietroalbini and others added 2 commits September 22, 2025 18:53
Created using spr 1.3.6-beta.1

[skip ci]
Created using spr 1.3.6-beta.1
@sunshowers sunshowers changed the base branch from sunshowers/spr/main.2n-reconfigurator-planning-gate-addsupdates-on-zone-image-sources-being-known to main September 22, 2025 18:53
@sunshowers sunshowers enabled auto-merge (squash) September 22, 2025 18:53
Created using spr 1.3.6-beta.1
Comment on lines +6512 to +6513
.with_target_release_0_0_1()
.expect("set target release to 0.0.1")
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry about this late comment! Wondering if it's possible to test the .with_target_release_0_0_1() functionality in a separate test instead of within the test_update_{ZONE} tests? I'm currently working on #9001 which will make successful MGS driven updates a requirement before updating any zones. In that PR, to get these tests to pass I had to include SP component artifacts that match what we see in the simulated environment so that the planner knows to not attempt any MGS driven updates. I realise I can just change the version for the artifacts, but the issue arises with the Host OS artifact which is not chosen by the planner via version but rather by hash. This new version set by with_target_release_0_0_1() no longer has a predefined hash, but a new calculated one. This makes it pretty tricky to work with.

Another option, but maybe worse, would be to only set zone versions in the fake.0.0.1.toml file. 🤔 Thoughts?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Discussed this with @karencfv in chat -- should be able to pull host OS hash versions from the target release.

@sunshowers sunshowers disabled auto-merge September 23, 2025 00:16
Created using spr 1.3.6-beta.1
@sunshowers sunshowers enabled auto-merge (squash) September 23, 2025 03:40
@sunshowers sunshowers merged commit 8571be3 into main Sep 23, 2025
16 checks passed
@sunshowers sunshowers deleted the sunshowers/spr/2n-reconfigurator-planning-gate-addsupdates-on-zone-image-sources-being-known branch September 23, 2025 07:46
leftwo pushed a commit that referenced this pull request Sep 26, 2025
…es being known (#8921)

Expand the set of gates for adds/updates to include the fact that zone
image sources should be known. Add tests for this:

* `cmds-mupdate-update-flow` contains the bulk of testing for this
scenario.
* I had to make tweaks to some tests, particularly to
`cmds-target-release.txt`, in order to start running the test in earnest
from the Artifact state rather than the InstallDataset state.
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.

mupdate/update recovery flow should ensure that all deployment units are at known versions before proceeding with other operations

5 participants