Merge 3.0 to 3.1 #15422
Merged
Merge 3.0 to 3.1 #15422
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
This resolves: https://bugs.launchpad.net/juju/+bug/2011629 Flyby fix a spelling mistake
…force_when_forcing juju#15399 Also flyby fix a spelling mistake ## QA steps ``` $ juju bootstrap aws/eu-west-2 aws $ juju add-model m $ juju add-machine $ juju add-machine lxd:0 $ juju model-config mode="requires-prompt" $ juju remove-machine 0 WARNING This command will perform the following actions: will remove machine 0 will remove machine 0/lxd/0 This will require `--force` Continue [y/N]? n $ juju remove-machine 0 --force WARNING This command will perform the following actions: will remove machine 0 will remove machine 0/lxd/0 Continue [y/N]? y ``` ## Bug reference https://bugs.launchpad.net/juju/+bug/2011629
…oken_user_access juju#15395 This PR ports the fix for the broken user access reported in juju#15351 and juju#15324 ## Checklist *If an item is not applicable, use `~strikethrough~`.* - [ ] Code style: imports ordered, good names, simple structure, etc - [ ] Comments saying why design decisions were made - [ ] Go unit tests, with comments saying what you're testing - [ ] [Integration tests](https://github.com/juju/juju/tree/develop/tests), with comments saying what you're testing - [ ] [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages ## QA steps Refer to juju#15324 for QA steps.
`test_attach_resources` - rename supply_res_rev test to disambiguate
juju#15418 28640b5 deleted the `test_attach_resources` test in the resources suite, but didn't remove the reference from `task.sh`. Test runs were failing with ``` 18:39:48 suites/resources/task.sh: line 18: test_attach_resources: command not found ``` Also, change the `name` in `run_resource_refresh_no_new_charm_rev_supply_res_rev` to disambiguate from `run_resource_refresh_no_new_charm_rev`. This test is still failing, unfortunately. ## QA steps ```sh cd tests ./main.sh -v resources ```
juju#15419 The `branches` tests were failing because the `mongodb` charm doesn't have a `latest/stable` channel. Install it from `3.6/stable` as [recommended by Charmhub](https://charmhub.io/mongodb). ## QA steps ``` cd tests ./main.sh -v -s '"test_active_branch_output"' branches test_branch ```
…230404 juju#15420 Merge 2.9 to 3.0 after juju#15418 and juju#15419 changes. ## To be propagated here 972fb56 (upstream/2.9, 2.9) Merge pull request juju#15419 from barrettj12/branch-test e71fe4b Merge pull request juju#15418 from barrettj12/resource-func-not-found
|
/merge |
3 similar comments
|
/merge |
|
/merge |
|
/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 3.0 to 3.1 after #15418 and #15419 changes.
To be ported
0e69838 (upstream/3.0) Merge pull request #15420 from juanmanuel-tirado/merge-2.9-3.0_20230404
dbaae24 Merge pull request #15399 from jack-w-shaw/JUJU-3343_dont_prompt_force_when_forcing