Skip to content

Forward port latest changes from 2.9 onto 3.x#1022

Merged
jujubot merged 6 commits intojuju:masterfrom
cderici:forward-ports-from-29
Feb 8, 2024
Merged

Forward port latest changes from 2.9 onto 3.x#1022
jujubot merged 6 commits intojuju:masterfrom
cderici:forward-ports-from-29

Conversation

@cderici
Copy link
Copy Markdown
Contributor

@cderici cderici commented Feb 8, 2024

Description

This brings onto the 3.x track some of the latest fixes from to the 2.9 track. Here're the details:

QA Steps

No QA needed for #990. For 1002 and 1003 please refer to their QA steps. Though they are very related so I'd expect the QA for both of them can be done in one fell swoop.

All CI tests need to pass (there's still some known intermittent ones in there).

For both model and controller connections, accounts.yaml is required
to have both username and password for connection to be
established. This is not always true, for example, juju
change-user-password actually removes the password from the
accounts.yaml file.
Fixes juju#998

ControllerAPIInfoForModels call requires the uuid of the controller
model, and if the user doesn't have at least read access, they won't
be able to have that, and the update_endpoint call at the end of a
regular connection fails.
@cderici cderici added the hint/3.x going on main branch label Feb 8, 2024
Copy link
Copy Markdown
Member

@jack-w-shaw jack-w-shaw left a comment

Choose a reason for hiding this comment

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

Provided the integration test failures are known failures, LGTM

@cderici
Copy link
Copy Markdown
Contributor Author

cderici commented Feb 8, 2024

Provided the integration test failures are known failures, LGTM

yeah just tried them locally they pass 👍 thanks for the review!

@cderici
Copy link
Copy Markdown
Contributor Author

cderici commented Feb 8, 2024

/merge

@jujubot jujubot merged commit dd93886 into juju:master Feb 8, 2024
@cderici cderici mentioned this pull request Feb 8, 2024
jujubot added a commit that referenced this pull request Feb 13, 2024
#1024

## What's Changed
* Remove paramiko upper-bound by @gboutry in #1005
* Remove explicit passing of event_loop into tests by @cderici in #1006
* chore: remove the upper restrictions on the websockets dependency by @tonyandrewmeyer in #1007
* Target ceiling version by @cderici in #1008
* Make it easier to run tests using `make` by @cderici in #1012
* Avoid installing signal handlers to the event loop by @cderici in #1014
* feat: remove app block until done by @yanksyoon in #1017
* feat: remove app timeout by @yanksyoon in #1018
* Forward port latest changes from 2.9 onto 3.x by @cderici in #1022

#### Notes & Discussion

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

Labels

hint/3.x going on main branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants