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.

Sign up for GitHub

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

Jump to bottom

2.9 into develop #14533

Merged
merged 21 commits into from Aug 30, 2022
Merged

2.9 into develop #14533

merged 21 commits into from Aug 30, 2022

Conversation

ycliuhw
Copy link
Member

@ycliuhw ycliuhw commented Aug 30, 2022 •
edited

Merge 2.9 into develop

# Conflicts:
#       tests/suites/deploy/bundles/cmr_bundles_test_deploy.yaml
#       tests/suites/backup/backup.sh
#       tests/suites/deploy/bundles/telegraf_bundle.yaml
#       tests/suites/expose_ec2/expose_app.sh
#       tests/suites/hooks/reboot.sh
#       tests/suites/hooktools/state_tools.sh

ycliuhw and others added 16 commits August 29, 2022 17:02
@ycliuhw
Rewrite run_deploy_cmr_bundle to use etcd and easyrsa charms because …
11b3419 
…mysql and wordpress charms are not maintained;
@ycliuhw
Fix wrong unit numbers in run_network_health;
8f9774d
@ycliuhw
Use the latest jameinel-ubuntu-lite;
6066dee
@ycliuhw
Use latest apache2 for apache2-with-offers/bundle.yaml;
5c41630
@ycliuhw
Remove debug changes;
b9b8172
@ycliuhw
Change testcharms/charm-repo/bundle/apache2-with-offers/bundle.yaml b…
a7971bf 
…ack to bionic for 2.9;
@jujubot
Merge pull request juju#14526 from ycliuhw/fix-ci
7942573 
juju#14526

Some bash test fixes.
@anvial
Fixed channel issue.
5f18224
@wallyworld
Merge pull request juju#14529 from anvial/JUJU-1701-fix-test-deploy-t…
9b428ef 
…est-deploy-bundles-aws

[JUJU-1701] Fixed test-deploy-test-deploy-bundles-aws
@jujubot @wallyworld
Merge pull request juju#14530 from hmlanigan/fix-hooktools-ci-test
ca46972 
juju#14530

run_state_set_clash_uniter_state of the hook tools suite was calling the update-status hook on the ubuntu charm. However rev 20 of the ubuntu charm does not have an update-status hook to call. Use install instead, other choices are start and upgrade-charm.

```sh
(cd tests ; ./main.sh hooktools)
```
@jujubot @wallyworld
Merge pull request juju#14523 from hmlanigan/deploy-revision-integrat…
1a74450 
…ion-tests

juju#14523

Update the revisions used in the integration tests to use charms which support jammy and focal. See juju#14515 for charm changes.

```sh
(cd tests ; ./main.sh deploy test_deploy_revision)
```
@wallyworld
Merge pull request juju#14531 from wallyworld/backport-test-fixes
9d3c15b 
Backport test fixes
@ycliuhw
Deploy juju-qa-ubuntu-plus with --force temporary;
d036731
@wallyworld
Merge pull request juju#14532 from ycliuhw/fix-ci
024721f 
Fix ci
@ycliuhw
Merge branch '2.9' into 2.9-into-develop
52d7816
@ycliuhw
Upgrade series to focal for testcharms/charm-repo/bundle/apache2-with…
a9442c1 
…-offers/bundle.yaml;
@ycliuhw
Copy link
Member Author

ycliuhw commented Aug 30, 2022

!!build!!

@ycliuhw
Copy link
Member Author

ycliuhw commented Aug 30, 2022

/build

@ycliuhw
Copy link
Member Author

ycliuhw commented Aug 30, 2022

/merge

@jujubot jujubot merged commit a20759e into juju:develop Aug 30, 2022
@manadart manadart mentioned this pull request Sep 2, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wallyworld wallyworld wallyworld approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@ycliuhw @wallyworld @jujubot @anvial