2.9 into develop #14563
Merged
2.9 into develop #14563
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
charmhub. Change default bundle series to jammy. Update the bundle.yaml to reflect what is in charmhub.
juju#14540 Reflect changes uploaded and released with charmcraft for the juju-qa-bundle-test. Update files used to create the juju-qa-bundle-test uploaded to charmhub. Change default bundle series to jammy. Update the bundle.yaml to reflect what is in charmhub. ## QA steps test-bundles-deploy should now succeed on 3.0 as no longer using bionic in most recent upload of the bundle. ```sh (cd tests ; ./main.sh -v deploy test_deploy_bundles) ``` Files should match the blob in charmhub ```sh juju download juju-qa-bundle-test unzip juju-qa*.bundle ```
Particularly: Summary followed by Description. Also move StorURL down per Daniele's comment on the bug. https://bugs.launchpad.net/juju/+bug/1969111
[JUJU-1721] ] local ubuntu plus charm in integration tests
Fix ck and migration tests
juju#14552 [LP 1969111)](https://bugs.launchpad.net/juju/+bug/1969111) notes that we want to show "summary" next to "description", so do that. Also move "publisher" up per John's layout, and move "store-url" down per Daniele's comment on the bug. Tested via Go tests. We do have integration tests of `juju info`, but they don't test the key ordering (probably for the better). ## Checklist - [x] Code style: imports ordered, good names, simple structure, etc - [x] Comments saying why design decisions were made - [x] 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~ - [x] [doc.go](https://discourse.charmhub.io/t/readme-in-packages/451) added or updated in changed packages ## QA steps Just run `juju info` and ensure the fields are in this order: name, publisher, summary, description, store-url, and so on. ```sh $ juju info postgresql name: postgresql publisher: Data Platform summary: PostgreSQL object-relational SQL database (supported version) description: | PostgreSQL is a powerful, open source object-relational database system. It has more than 15 years of active development and a proven architecture that has earned it a strong reputation for reliability, data integrity, and correctness. It is fully ACID compliant, has full support for foreign keys, joins, views, triggers, and stored procedures (in multiple languages). It includes most SQL:2008 data types, including INTEGER, NUMERIC, BOOLEAN, CHAR, VARCHAR, DATE, INTERVAL, and TIMESTAMP. It also supports storage of binary large objects, including pictures, sounds, or video. It has native programming interfaces for C/C++, Java, .Net, Perl, Python, Ruby, Tcl, ODBC, among others, and exceptional documentation (http://www.postgresql.org/docs/manuals/). store-url: https://charmhub.io/postgresql charm-id: ChgcZB3RhaDOnhkAv9cgRg52LhjBbDt8 supports: focal, bionic, xenial tags: databases subordinate: false relations: provides: data: block-storage db: pgsql db-admin: pgsql local-monitors: local-monitors master: pgreplication nrpe-external-master: nrpe-external-master syslog: syslog requires: {} channels: | latest/stable: initial-reactive-256-gf4424fe-dirty 2022-07-25 (241) 5MB latest/candidate: ↑ latest/beta: ↑ latest/edge: 245 2022-08-29 (245) 6MB ``` ## Bug reference https://bugs.launchpad.net/juju/+bug/1969111
[JUJU-1683] Wait for 30s to let the relation joined;
|
/build |
hpidcock
approved these changes
Sep 2, 2022
wallyworld
approved these changes
Sep 2, 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.
Merge branch '2.9' into 2.9-into-develop