Merge 2.9 into 3.1 #16619
Merged
Merge 2.9 into 3.1 #16619
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
Update merge bot to reflect the new 3.4 branch, and the closing of 3.2
juju#16583 Update merge bot to reflect the new 3.4 branch, and the closing of 3.2 As a flyby, prune some whitespace
juju#16465 Docker v2 registries employ a standard process for authentication by returning challenge in the WWW-Authenticate header. This change attempts to use this process for all generic repositories. ## QA steps This has been tested with quay.io, jfrog artifactory, google cloud artifact repository and digital ocean registry. - `export DOCKER_USERNAME=my-registry.com/juju-test` - `make seed-repository` - `JUJU_BUILD_NUMBER=0 make push-release-operator-image` - `juju bootstrap minikube --config caas-image-repo='{"repository":"my-registry.com/juju-test","username":"<username>","password":"<password>"}'` ## Documentation changes N/A ## Links **Launchpad bug:** https://bugs.launchpad.net/juju/+bug/2039727 **Jira card:** JUJU-4820
Teardown has been observed to fail with a prompt to include it.
…test-ctrl juju#16618 Failure to tear down has been observed in CI test runs, with: ``` 03:30:44 | WARNING This command will destroy the "ctrl-zpbu2nqa" controller and all its resources 03:30:44 | ERROR cannot destroy controller "ctrl-zpbu2nqa" 03:30:44 03:30:44 | The controller has persistent storage remaining: 03:30:44 | 6 volumes and 6 filesystems in 1 model 03:30:44 03:30:44 | To destroy the storage, run the destroy-controller 03:30:44 | command again with the "--destroy-storage" option. 03:30:44 03:30:44 | To release the storage from Juju's management 03:30:44 | without destroying it, use the "--release-storage" 03:30:44 | option instead. The storage can then be imported 03:30:44 | into another Juju model. ``` Here we add the suggested option. ## QA steps Run an integration test suite, such as: `cd tests && ./main.sh controller`
SimonRichardson
approved these changes
Nov 27, 2023
|
/merge |
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.
Merge from 2.9 to bring forward:
Trivial conflict in test includes for -y versus --no-prompt.