Merge 2.9 into develop #14359
Merged
Merge 2.9 into develop #14359
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
Adds a user-agent to API requests to Equinix. This user-agent follows the prefix format in-use by the Azure provider. The suffix of the user-agent is the default packngo user-agent (expressing the version of packngo in use). From an Equinix Metal perspective, this will help gauge Juju consumption of the Equinix Metal API. Signed-off-by: Marques Johansson <mjohansson@equinix.com>
…ap-provider-logic [JUJU-1482] Moved case BOOTSTRAP_PROVIDER logic from task.sh
Ensure the resource is used to verify the resource revision.
…ed-constraints-test-from-juju [JUJU-1485] remove python based constraints test from juju
Fix LP 1982406. Update the test to use a non zero revision. Setting the value to a default for int was a bad idea and masked the problem.
…evision juju#14356 Resource revisions were checked when adding a pending resource and the appropriate one found. However when it can time to download and install the resource, the revision was ignored for charm hub charms. Updated the integration tests to appropriately verify this. ## QA steps ```sh (cd tests ; ./main.sh -v deploy test_deploy_revision ) ``` ## Bug reference https://bugs.launchpad.net/juju/+bug/1982406
…odel_migration juju#14348 Cover remain parts of our the acceptance test nw-model-migration in our bash-based test suites. Namely: - Check debug-logs are maintained - Check it's possible to add a unit to a migrated application - Check it's possible to add a unit to a migrated application when the original controller has been destroyed ## Checklist - ~[ ] Requires a [pylibjuju](https://github.com/juju/python-libjuju) change~ - [x] Added [integration tests](https://github.com/juju/juju/tree/develop/tests) for the PR - ~[ ] Added or updated [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) related to packages changed~ - [ ] Comments answer the question of why design decisions were made ## QA steps ```sh ./main.sh -v -s "test_model_config,test_model_multi,test_model_metrics" model BOOTSTRAP_PROVIDER=aws BOOTSTRAP_CLOUD=aws ./main.sh -v -s "test_model_config,test_model_multi,test_model_metrics" model ```
juju#13596 Adds a user-agent to API requests to Equinix. This user-agent follows the prefix [format in-use by the Azure provider](juju/juju@develop...displague:equinix-user-agent). The suffix of the user-agent is the default packngo user-agent (expressing the version of packngo in use). From an Equinix Metal perspective, this will help gauge Juju consumption of the Equinix Metal API. The existing `"juju"` string in the client constructor is a "Consumer-Token" which produces an "X-Consumer-Token" HTTP Header. User-Agents are more common and detailed than the Equinix Metal specific Consumer-Token.
jameinel
approved these changes
Jul 21, 2022
|
/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.
Conflicts in
tests/suites/network/network_health.sh
resource/charmhub.go
(upstream/2.9) Merge pull request #13596 from displague/equinix-user-agent
Merge pull request #14348 from jack-w-shaw/JUJU-1200_bash_based_model_migration
Merge pull request #14356 from hmlanigan/use-requested-resource-revision
Merge pull request #14354 from anvial/JUJU-1485-remove-python-based-constraints-test-from-juju
Merge pull request #14346 from anvial/JUJU-1482-move-case-bootstrap-provider-logic