2.9 into develop #14405
Merged
2.9 into develop #14405
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
juju#14391 If shfmt isn't installed, the static analysis test suite skips this test. This has been allowing lint failures to pass unnoticed ## Checklist - ~[ ] 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~ - [x] [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 Successfully run the static analysis gh action, verifying shfmt linting runs
juju#14398 Since juju#14298 has landed in 3.0, it is now possible to upgrade to 3.0. ## QA steps Test an upgrade to 3.0 ## Documentation changes N/A ## Bug reference N/A
Cleaning up local copies of the Ubuntu charm in favour of Charmhub.
Also made deployments of test charm from charmhub instead of locally.
- Updated for packing and uploading with charmcraft.
- Moved usages of lxd-profile-without-devices over to charmhub.
- Consolidates the lxd profile subordinate charm. - Updates charm for use with charmhub and charmcraft.
juju#14375 Continued work that is stable for cleaning up charms in our testing infra. - Upgrading charms for charmcraft/charmhub support. - Adding LTS ubuntu releases including jammy support. - Adding support for other arch's besides amd64 - Moving tests to use cloud charms from Charmhub and not performing local deploys unless that is the test's purpose. ## Checklist - [x] 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 - [x] Added or updated [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) related to packages changed - [x] Comments answer the question of why design decisions were made ## QA steps - Verify uploaded charms in Charmhub - Run affected tests suits locally for successful test run. ## Documentation changes N/A ## Bug reference N/A
wallyworld
approved these changes
Aug 2, 2022
|
/merge |
Conflicts:
apiserver/facades/client/client/client_test.go
testcharms/charms/appdata-sink/metadata.yaml
testcharms/charms/appdata-source/metadata.yaml
testcharms/charms/departer/.gitignore
testcharms/charms/departer/.jujuignore
testcharms/charms/departer/LICENSE
testcharms/charms/departer/charmcraft.yaml
testcharms/charms/departer/requirements.txt
testcharms/charms/departer/revision
testcharms/charms/departer/src/charm.py
testcharms/charms/lxd-profile-subordinate/metadata.yaml
tests/suites/deploy/bundles/lxd-profile-bundle.yaml
tests/suites/deploy/deploy_charms.sh
tests/suites/smoke/charms/ubuntu/metadata.yaml
tests/suites/smoke/deploy.sh
tests/suites/upgrade/charms/ubuntu/metadata.yaml
upgrades/upgradevalidation/version_test.go
|
/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:
apiserver/facades/client/client/client_test.go
testcharms/charms/appdata-sink/metadata.yaml
testcharms/charms/appdata-source/metadata.yaml
testcharms/charms/departer/.gitignore
testcharms/charms/departer/.jujuignore
testcharms/charms/departer/LICENSE
testcharms/charms/departer/charmcraft.yaml
testcharms/charms/departer/requirements.txt
testcharms/charms/departer/revision
testcharms/charms/departer/src/charm.py
testcharms/charms/lxd-profile-subordinate/metadata.yaml
tests/suites/deploy/bundles/lxd-profile-bundle.yaml
tests/suites/deploy/deploy_charms.sh
tests/suites/smoke/charms/ubuntu/metadata.yaml
tests/suites/smoke/deploy.sh
tests/suites/upgrade/charms/ubuntu/metadata.yaml
upgrades/upgradevalidation/version_test.go