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

Merge to 3.0 #15475

Merged
merged 9 commits into from
Apr 13, 2023
Merged

Merge to 3.0 #15475

merged 9 commits into from
Apr 13, 2023

Conversation

hmlanigan
Copy link
Member

Conflicts:

  • cmd/juju/user/change_password_test.go

barrettj12 and others added 9 commits April 12, 2023 17:06
juju#15465

juju#15453 and juju#15460 tried to fix the deploy bundles tests, without success. Unfortunately, the `tiny-bash` charm doesn't support arm64, so we'll switch to the `juju-qa-test` charm which does.

## QA steps

Check the bundles tests now pass.

```sh
cd tests
./main.sh -v \n -s '"test_cmr_bundles_export_overlay,test_deploy_charms,test_deploy_default_series,test_deploy_os,test_deploy_revision,run_deploy_lxd_profile_bundle_openstack,run_deploy_lxd_profile_bundle"' \n deploy test_deploy_bundles
```

## TODO

- [x] Test on amd64
- [x] Test on arm64
juju#15470

## Checklist

- [x] 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

```sh
./main.sh -v -c aws -p aws -R eu-west-2 manual test_deploy_manual
```
juju#15472

To make scripting easier for `login` and `change-user-password`, this introduces
a `--no-prompt` parameter to these commands. `login` also has a `--trust` for
trusting the controller's CA certificate when combined with `--no-prompt`.

With `--no-prompt` only the password can be read from stdin (newline expected), nothing else can be
read from stdin.

## QA steps

- `./main.sh -v -s '"test_user_manage"' user test_user_login_password`
- Also check you can still use the interactive flow.

## Documentation changes

Command documentation needs to be regenerated.

## Bug reference

N/A
The primary purpose of this is to debug some errors we're seeing.
However, this test could do with some logging here anyway
juju#15473

The primary purpose of this is to debug some errors we're seeing. However, this test could do with some logging here anyway

## Checklist

- [x] Code style: imports ordered, good names, simple structure, etc
- [x] 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

```sh
./main.sh -v -c aws -R us-east-1 spaces_ec2
```
Copy link
Contributor

@cderici cderici left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@hmlanigan
Copy link
Member Author

/merge

1 similar comment
@hmlanigan
Copy link
Member Author

/merge

@jujubot jujubot merged commit 37e2743 into juju:3.0 Apr 13, 2023
@hmlanigan hmlanigan mentioned this pull request Apr 13, 2023
jujubot added a commit that referenced this pull request Apr 13, 2023
#15476

prdesc #15475 from hmlanigan/merge-to-3.0

No conflicts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants