Merged
Conversation
332b0b1 to
a715a4c
Compare
luci1900
approved these changes
Jan 7, 2026
alesstimec
approved these changes
Jan 8, 2026
Collaborator
alesstimec
left a comment
There was a problem hiding this comment.
LGTM one the juju jaas add-model command lands
a715a4c to
3655fe4
Compare
This file contains hidden or 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
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
This PR modifies the upgrade test. It avoids installing a fixed version of the Juju snap to bootstrap an old agent version and instead relies on the bootstrap command's
--agent-versionflag.The test bootstraps a controller with a fixed agent version of 3.6.11, creates a model on that controller, and then attempts to upgrade it. It verifies the upgrade is complete by polling so that when the API becomes async minimal changes to the test will be required.
In order to create the model on the correct controller we use a JAAS command that is currently WIP i.e.
juju jaas add-model --target-controller. Once this functionality lands this test should be ready.One hurdle faced here was how the bootstrapped controller (done during
upgrade-toexecution) would connect tojimm.localhost. In the integration test workflow we the login-token-refresh-url to"http://${{ env.MACHINE_IP }}:17070/.well-known/jwks.json"whereMACHINE_IPis the address of the default network interface on the device. This routes traffic from containers to the host to the JIMM container exposed alongside Traefik without TLS and makes the testing much easier. We may want to, in the future, consider cloning the controller with all its config (controller and model config).On a final note, this test is quite slow because it is bootstrapping 2 controllers. It is worth a dicussion on how to improve this. Some ideas include,
Fixes JUJU-8938
Engineering checklist