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

[JUJU-792] Move model-defaults test from legacy to new Bash tests #13885

Merged
merged 3 commits into from Mar 25, 2022

Conversation

benhoyt
Copy link
Member

@benhoyt benhoyt commented Mar 25, 2022

This PR moves the juju model-defaults CLI tests from the legacy Python-based acceptancetests tests to the new Bash test "framework". The is not a direct "port" but hopefully a port of the intent: get and set model defaults, including a cloud/region test.

QA steps

To run the model-defaults tests, including these new ones:

# Run model-defaults tests on a local LXD controller (except the region test)
./main.sh -l localhost-localhost cli test_model_defaults

# Run model-defaults tests using an AWS controller (including the region test)
./main.sh -l aws-us-east-1 -p aws cli test_model_defaults

Copy link
Member

@wallyworld wallyworld left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome

Comment on lines +32 to +33
juju model-defaults automatically-retry-hooks --format=yaml | grep 'default: true'
juju model-defaults automatically-retry-hooks --format=yaml | grep 'controller: false'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

run once and assign to a var?

@wallyworld
Copy link
Member

I'll merge this as is to get the jenkins updates happening, we can decide later to implement the optimisation tweak

@wallyworld wallyworld merged commit f5703bc into juju:2.9 Mar 25, 2022
@benhoyt benhoyt deleted the model-defaults-test-bash branch March 25, 2022 21:18
jujubot added a commit that referenced this pull request Mar 30, 2022
#13897

- #13891 from hmlanigan/lxd-profile-watcher-regression
- #13850 from jack-w-shaw/JUJU-416_Consolidate_retries_worker_tests_1
- #13871 from arnodel/juju-810-simpleconnector-support-for-ha-controllers
- #13843 from jack-w-shaw/JUJU-416_Consolidate_retries_worker_upgradedatabase
- #13842 from jack-w-shaw/JUJU-416_Consolidate_retries_worker_peergrouper
- #13866 from arnodel/juju-803-move-connector-implementations
- #13893 from ycliuhw/allow-OfficialBuild-Build-coexist
- #13883 from barrettj12/deploy-revision-err
- #13886 from ycliuhw/Fix-Build-OfficialBuild
- #13873 from arnodel/juju-812-remove-connection-reboot-method
- #13878 from arnodel/juju-819-remove-connection-client-method
- #13875 from arnodel/juju-814-remove-connection-unitassigner-method
- #13874 from arnodel/juju-813-remove-connection-instancepoller-method
- #13885 from benhoyt/model-defaults-test-bash
- #13856 from naveensrinivasan/naveen/feat/pin-deps
- #13881 from barrettj12/refresh-local-origin2
- #13882 from benhoyt/tweak-assess
- #13834 from wallyworld/leader-settings-dying
- #13870 from wallyworld/model-default-coerce
- #13869 from arnodel/juju-806-remove-connection-uniter-method
- #13852 from hmlanigan/charm-resources-regression
- #13872 from arnodel/juju-811-remove-connection-upgrader-method
- #13863 from SimonRichardson/charmhub-proxy-middleware
- #13865 from hmlanigan/bootstrap-help-update
- #13855 from SimonRichardson/hide-debug-stack
- #13862 from wallyworld/azure-instance-refresh
- #13755 from jack-w-shaw/JUJU-422_Drop_Space.Subnets-2
- #13860 from jack-w-shaw/fix_shfmt_failure

Usual conflicts.

CONFLICT (content): Merge conflict in worker/caasunitprovisioner/worker_test.go
CONFLICT (content): Merge conflict in worker/caasoperatorprovisioner/worker_test.go
CONFLICT (content): Merge conflict in worker/caasfirewaller/worker_test.go
CONFLICT (content): Merge conflict in cmd/juju/machine/remove.go
CONFLICT (content): Merge conflict in cmd/juju/application/refresh.go
CONFLICT (content): Merge conflict in cloudconfig/podcfg/podcfg_test.go
CONFLICT (content): Merge conflict in caas/kubernetes/provider/bootstrap_test.go
CONFLICT (content): Merge conflict in apiserver/facades/client/client/client_test.go
CONFLICT (content): Merge conflict in apiserver/facades/client/charms/services/repofactory.go
CONFLICT (modify/delete): apiserver/facades/client/charmhub/charmhub.go deleted in HEAD and modified in 2.9. Version 2.9 of apiserver/facades/client/charmhub/charmhub.go left in tree.
CONFLICT (content): Merge conflict in apiserver/facades/client/application/application_test.go
CONFLICT (content): Merge conflict in api/agent/uniter/uniter.go


## QA steps

Tests pass.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants