Merge 3.1 3.2 20230707 #15875
Merged
Merge 3.1 3.2 20230707 #15875
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
juju#15860 This PR makes the role binding update faster if no update needs to be done.
juju#15864 juju#15328 made a miss-step in making the upgrader only run when the model is alive, since many things hang off the upgraded flag, including the cleaner worker, which needs to run during model destruction. ## QA steps `./main.sh -v -s '"test_block_commands,test_display_clouds,test_model_config,test_model_defaults,test_unregister"' cli test_local_charms` ## Documentation changes N/A ## Bug reference https://jenkins.juju.canonical.com/job/test-cli-test-local-charms-lxd/1336/consoleText
juju#15863 Merge 2.9 -> 3.1: - juju#15860 Conflicts: - caas/kubernetes/provider/operator_test.go - caas/kubernetes/provider/package_test.go - caas/kubernetes/provider/rbac_test.go - caas/kubernetes/provider/k8s_test.go
…n-instance-poller Fix TestManageModelRunsInstancePoller by extending timeout.
AKS cleanup appears to now work with destroy-controller.
juju#15872 If you use `juju ssh` too fast after creating a machine, it may have addresses, but not yet have reported its host keys back to the controller. This allows the ssh command to wait a reasonable time for those keys. ## QA steps - Bootstrap LXD - Create model config yaml file ``` $ cat wrench.yaml cloudinit-userdata: | write_files: - content: | delay path: /var/lib/juju/wrench/hostkeyreporter ``` - `$ juju model-config wrench.yaml` - `$ juju add-machine --series jammy` - `$ juju ssh 0` - ssh should take up to a minute to resolve, but should connect successfully or return `ERROR retrieving SSH host keys for "0": keys not found` ## Documentation changes N/A ## Bug reference https://jenkins.juju.canonical.com/job/test-controller-test-metrics-lxd/2/consoleText
juju#15873 Extend TestEnvironDestroyTimeoutForce timeout as 1 millisecond is too short, as the code will consistently skip Destroy and go straight to force destruction. ## QA steps - install golang.org/x/tools/cmd/stress - `cd worker/undertaker` - `go test -race -c` - `stress ./undertaker.test -check.f=TestEnvironDestroyTimeoutForce` ## Documentation changes N/A ## Bug reference https://jenkins.juju.canonical.com/job/unit-tests-race-amd64/1346/consoleText
Conflicts: - cmd/juju/commands/main.go - cmd/juju/ssh/debugcode.go - cmd/juju/ssh/debugcode_test.go - cmd/juju/ssh/debughooks.go - cmd/juju/ssh/debughooks_test.go - cmd/juju/ssh/scp.go - cmd/juju/ssh/scp_unix_test.go - cmd/juju/ssh/ssh_container.go - cmd/juju/ssh/ssh_machine.go - cmd/juju/ssh/ssh_machine_test.go - cmd/juju/ssh/ssh_unix_test.go
juju#15874 Forward ports: - juju#15864 - juju#15870 - juju#15871 - juju#15872 - juju#15873 Conflicts: - cmd/juju/commands/main.go - cmd/juju/ssh/debugcode.go - cmd/juju/ssh/debugcode_test.go - cmd/juju/ssh/debughooks.go - cmd/juju/ssh/debughooks_test.go - cmd/juju/ssh/scp.go - cmd/juju/ssh/scp_unix_test.go - cmd/juju/ssh/ssh_container.go - cmd/juju/ssh/ssh_machine.go - cmd/juju/ssh/ssh_machine_test.go - cmd/juju/ssh/ssh_unix_test.go
wallyworld
approved these changes
Jul 7, 2023
|
/merge |
1 similar comment
|
/merge |
Merged
jujubot
added a commit
that referenced
this pull request
Jul 7, 2023
#15881 Merges: - #15845 - #15852 - #15854 - #15849 - #15855 - #15857 - #15861 - #15862 - #15825 - #15866 - #15863 - #15870 - #15871 - #15872 - #15873 - #15874 - #15875 One substantial conflict in `cmd/juju/application/deployer/bundlehandler.go` & `cmd/juju/application/deployer/bundlehandler_test.go`, resulting in failing unit tests. The conflict relates to this PR: - #15825 These were fixed by the two tops commits ### QA Steps Ensure all unit tests pass ``` go test github.com/juju/juju/cmd/juju/application/deployer go test github.com/juju/juju/core/charm go test github.com/juju/juju/apiserver/facades/client/application ``` Ensure we can deploy a complex bundle ``` juju deploy kubeflow ```
Merged
jujubot
added a commit
that referenced
this pull request
Jul 11, 2023
#15896 Forward ports: - #15845 - #15725 - #15852 - #15854 - #15849 - #15855 - #15857 - #15861 - #15862 - #15860 - #15864 - #15825 - #15866 - #15863 - #15870 - #15871 - #15872 - #15873 - #15874 - #15876 - #15875 - #15881 - #15727 - #15883 - #15884 - #15880 - #15879 - #15886 - #15887 - #15877 - #15888 - #15893 - #15894 Conflicts: - cmd/juju/ssh/debugcode_test.go - cmd/juju/ssh/debughooks_test.go - cmd/juju/ssh/scp_unix_test.go - cmd/juju/ssh/ssh_machine.go - cmd/juju/ssh/ssh_machine_test.go - cmd/juju/ssh/ssh_unix_test.go - worker/dbaccessor/worker.go - caas/kubernetes/provider/k8s_test.go - caas/kubernetes/provider/operator_test.go - caas/kubernetes/provider/package_test.go - caas/kubernetes/provider/rbac.go - cmd/juju/application/deployer/bundlehandler.go - cmd/juju/application/deployer/bundlehandler_test.go - cmd/jujud/agent/model/manifolds.go - core/bundle/changes/changes.go - worker/caasapplicationprovisioner/application.go - worker/caasapplicationprovisioner/application_test.go - worker/caasapplicationprovisioner/mock_test.go
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Forward ports:
No conflicts.