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

Use --client for display cloud test #14254

Merged

wallyworld merged 1 commit into juju:2.9 from wallyworld:fix-display-cloud-test

Jul 6, 2022

Member

wallyworld commented Jul 6, 2022

Same fix as for #14253

Use --client instead of --local for display cloud tests.


          Use --client for display cloud test

a0e6911

benhoyt approved these changes

View reviewed changes

wallyworld merged commit a140aa6 into juju:2.9

wallyworld mentioned this pull request

Merge 2.9 #14259

Merged

jujubot added a commit that referenced this pull request


          Merge pull request #14259 from wallyworld/merge-2.9-20220706

3e3a32c

#14259

Merge 2.9

#14250 [JUJU-1393] Do not set application status in charmdownloader
#14238 [JUJU-1394] Deprecate old ubuntu for model migrate upgrade
#14242 [JUJU-1386] Upgrade step to remove use-floating-ip=false from config
#14247 Fix type in add-cloud help doc
#14248 fixed charm channel issue in test-trusted-bundles-deploy-aws
#14244 [JUJU-1400] Migrate allocate public ip constraint
#14175 [JUJU-1338] Uniter charmurl string
#14254 Use --client for display cloud test
#14252 [JUJU-1410] Make CMR robust to consume side relation removal
#14255 Rename show-controller uuid -> controller-uuid ('uuid' gone in 3.0)
#14256 [JUJU-1409] Stop forcing lxd tests to bionic

Conflicts were mostly import paths charm v8 vs v9
```
# Conflicts:
# api/agent/uniter/application.go
# apiserver/facades/client/client/client_test.go
# apiserver/facades/client/modelupgrader/upgrader_test.go
# core/series/supportedseries.go
# migration/precheck_test.go
# rpc/params/crossmodel.go
# state/state_test.go
# tests/includes/juju.sh
# upgrades/operations.go
# upgrades/upgrade_test.go
# upgrades/upgradevalidation/migrate_test.go
# upgrades/upgradevalidation/upgrade_test.go
# upgrades/upgradevalidation/validation.go
# upgrades/upgradevalidation/validation_test.go
# worker/uniter/operation/deploy.go
# worker/uniter/operation/deploy_test.go
# worker/uniter/operation/errors.go
# worker/uniter/operation/factory.go
# worker/uniter/operation/factory_test.go
# worker/uniter/operation/interface.go
# worker/uniter/operation/mocks/interface_mock.go
# worker/uniter/operation/state.go
# worker/uniter/operation/state_test.go
# worker/uniter/operation/util_test.go
# worker/uniter/remotestate/snapshot.go
# worker/uniter/remotestate/watcher.go
# worker/uniter/remotestate/watcher_test.go
# worker/uniter/resolver.go
# worker/uniter/resolver/interface.go
# worker/uniter/resolver/loop_test.go
# worker/uniter/resolver/mock_test.go
# worker/uniter/resolver/opfactory.go
# worker/uniter/resolver/opfactory_test.go
# worker/uniter/resolver_test.go
# worker/uniter/runcommands/runcommands_test.go
# worker/uniter/verifycharmprofile/verifycharmprofile_test.go
```

## QA steps

See PRs

[JUJU-1393]: https://warthogs.atlassian.net/browse/JUJU-1393?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1394]: https://warthogs.atlassian.net/browse/JUJU-1394?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1386]: https://warthogs.atlassian.net/browse/JUJU-1386?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1400]: https://warthogs.atlassian.net/browse/JUJU-1400?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1338]: https://warthogs.atlassian.net/browse/JUJU-1338?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1410]: https://warthogs.atlassian.net/browse/JUJU-1410?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ
[JUJU-1409]: https://warthogs.atlassian.net/browse/JUJU-1409?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet