Merge lp:~wallyworld/juju-core/1302205-backport-1.18 into lp:juju-core/1.18
Proposed by
Ian Booth
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ian Booth | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2278 | ||||
Proposed branch: | lp:~wallyworld/juju-core/1302205-backport-1.18 | ||||
Merge into: | lp:juju-core/1.18 | ||||
Diff against target: |
315 lines (+119/-19) 5 files modified
provider/manual/config.go (+2/-2) provider/manual/config_test.go (+16/-3) worker/instancepoller/machine_test.go (+29/-9) worker/instancepoller/updater.go (+20/-5) worker/instancepoller/updater_test.go (+52/-0) |
||||
To merge this branch: | bzr merge lp:~wallyworld/juju-core/1302205-backport-1.18 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Juju Engineering | Pending | ||
Review via email: mp+217646@code.launchpad.net |
Commit message
Cherry pick trunk 2588,2589 to backport fix for bug 1302205 "
manual provisioned systems stuck in pending on arm64"
Description of the change
Cherry pick trunk 2588,2589 to backport fix for bug 1302205 "
manual provisioned systems stuck in pending on arm64"
To post a comment you must log in.
The attempt to merge lp:~wallyworld/juju-core/1302205-backport-1.18 into lp:juju-core/1.18 failed. Below is the output from the failed tests.
ok launchpad. net/juju- core 0.012s net/juju- core/agent 1.085s net/juju- core/agent/ mongo 0.562s net/juju- core/agent/ tools 0.223s net/juju- core/bzr 5.046s net/juju- core/cert 2.759s net/juju- core/charm 0.445s net/juju- core/charm/ hooks [no test files] net/juju- core/charm/ testing [no test files] net/juju- core/cloudinit 0.030s net/juju- core/cloudinit/ sshinit 0.765s net/juju- core/cmd 0.161s net/juju- core/cmd/ charm-admin 0.275s net/juju- core/cmd/ charmd [no test files] net/juju- core/cmd/ charmload [no test files] net/juju- core/cmd/ juju 212.049s net/juju- core/cmd/ jujud 63.760s net/juju- core/cmd/ plugins/ juju-metadata 9.612s net/juju- core/cmd/ plugins/ juju-restore [no test files] net/juju- core/cmd/ plugins/ local 0.138s net/juju- core/cmd/ plugins/ local/juju- local [no test files] net/juju- core/constraint s 0.020s net/juju- core/container 0.038s net/juju- core/container/ factory 0.039s net/juju- core/container/ kvm 0.210s net/juju- core/container/ kvm/mock 0.044s net/juju- core/container/ kvm/testing [no test files] net/juju- core/container/ lxc 4.303s net/juju- core/container/ lxc/mock [no test files] net/juju- core/container/ lxc/testing [no test files] net/juju- core/container/ testing [no test files] net/juju- core/downloader 5.223s net/juju- core/environs 2.295s net/juju- core/environs/ bootstrap 10.368s net/juju- core/environs/ cloudinit 0.529s net/juju- core/environs/ config 1.636s net/juju- core/environs/ configstore 0.028s net/juju- core/environs/ filestorage 0.026s net/juju- core/environs/ httpstorage 0.676s net/juju- core/environs/ imagemetadata 0.463s net/juju- core/environs/ imagemetadata/ testing [no test files] net/juju- core/environs/ instances 0.045s net/juju- core/environs/ jujutest 0.150s net/juju- core/environs/ manual 11.457s net/juju- core/environs/ simplestreams 0.322s net/juju- core/environs/ simplestreams/ testing [no test files] net/juju- core/environs/ sshstorage 0.829s net/juju- core/environs/ storage 0.847s net/juju- core/environs/ sync 45.998s net/juju- core/environs/ testing 0.145s net/juju- core/environs/ tools 4.689s net/juju- core/environs/ tools/testing [no test files] net/juju- core/errors 0.012s net/juju- core/instance 0.025s net/juju- core/instance/ testing [no test files] net/juju- core/juju 21.041s net/juju- core/juju/ arc...
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
? launchpad.
? launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
ok launchpad.
? launchpad.
ok launchpad.
ok launchpad.