Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.9 into develop #14405

Merged
merged 27 commits into from
Aug 2, 2022
Merged

2.9 into develop #14405

merged 27 commits into from
Aug 2, 2022

Commits on Jul 28, 2022

  1. Configuration menu
    Copy the full SHA
    b0a174e View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. Configuration menu
    Copy the full SHA
    87180e1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0a83092 View commit details
    Browse the repository at this point in the history
  3. Merge pull request juju#14391 from jack-w-shaw/enable_shfmt_gh_action

    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
    jujubot committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    31c7f66 View commit details
    Browse the repository at this point in the history
  4. Fix typo

    hpidcock committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    00aa588 View commit details
    Browse the repository at this point in the history
  5. Merge pull request juju#14397 from hpidcock/fix-typo

    Fix typo
    hpidcock committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    8670b1f View commit details
    Browse the repository at this point in the history
  6. Allow upgrading to 3.0

    hpidcock committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    0f8f941 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. Fix upgrade tests for 3.0

    hpidcock committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    07a8418 View commit details
    Browse the repository at this point in the history
  2. Merge pull request juju#14398 from hpidcock/allow-upgrade-3.0

    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
    jujubot committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    2ac1f6d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    68c402e View commit details
    Browse the repository at this point in the history
  4. Removing local Ubuntu charm from upgrade tests.

    Cleaning up local copies of the Ubuntu charm in favour of Charmhub.
    tlm committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    7e4af48 View commit details
    Browse the repository at this point in the history
  5. Updating appdata-sink/source charm for charmhub.

    Also made deployments of test charm from charmhub instead of locally.
    tlm committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    098cf99 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d56f88e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a6b01e2 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    52423ca View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    629e996 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    bd643f4 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    16a0fe7 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    16b35ed View commit details
    Browse the repository at this point in the history
  13. Moved lxd-profile charm to charms dir.

    - Updated for packing and uploading with charmcraft.
    tlm committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    776fa25 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    576ef76 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    e196ea8 View commit details
    Browse the repository at this point in the history
  16. Updated usages of lxd-profile-without-devices.

    - Moved usages of lxd-profile-without-devices over to charmhub.
    tlm committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    637f7a6 View commit details
    Browse the repository at this point in the history
  17. Consolidation of the lxd-profile-subordinate charm.

    - Consolidates the lxd profile subordinate charm.
    - Updates charm for use with charmhub and charmcraft.
    tlm committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    e7a26db View commit details
    Browse the repository at this point in the history
  18. Merge pull request juju#14375 from tlm/charm-cleaning

    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
    jujubot committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    2924073 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    61ae1e2 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. Merge remote-tracking branch 'juju/2.9' into 2.9-into-develop

    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
    tlm committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    f40327f View commit details
    Browse the repository at this point in the history