Handle series upgrade for machine upgraded out-of-band #11764
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Includes some variable renaming and error annotation clarification.
and facade factory. This behaviour was not required due much older changes and is a logical simplification.
upgrade-series worker.
CurrentSeries method for accessing what Juju thinks the machine series is at present.
indirection and regenerates mocks.
the current OS series is. This is populated by supplying the value from the new CurrentSeries API method.
thinks the current series is rather than what the machine reports.
achilleasa
reviewed
Jun 26, 2020
achilleasa
approved these changes
Jun 26, 2020
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of change
This patch handles the case where
do-release-upgradeis run outside of the intended upgrade-series workflow.In the example of upgrading a machine from Xenial to Bionic, with Juju still thinking the machine is running Xenial, we see:
This patch still uses the locally determined series for detecting the init system, but for copying binaries we use the current machine series according to Juju's data.
QA steps
juju add-machine --series xenial.juju ssh 0and rundo-release-upgrade, confirming prompts as required.juju upgrade-series [0|1] prepare bionic -y. This should complete without error.juju upgrade-series complete 0.juju ssh 1and rundo-release-upgrade, confirming prompts as required.juju upgrade-series complete 1.Documentation changes
None.
Bug reference
https://bugs.launchpad.net/juju/+bug/1870195