Merge lp://qastaging/~1chb1n/ubuntu-openstack-ci/use-port-cleanup-tool into lp://qastaging/ubuntu-openstack-ci

Proposed by Ryan Beisner
Status: Merged
Merged at revision: 389
Proposed branch: lp://qastaging/~1chb1n/ubuntu-openstack-ci/use-port-cleanup-tool
Merge into: lp://qastaging/ubuntu-openstack-ci
Diff against target: 836 lines (+196/-227)
19 files modified
.bzrignore (+1/-0)
common/osci_utils.py (+4/-4)
job-parts/build_deploy_test.sh (+1/-1)
job-parts/build_deployer_quickcheck.sh (+1/-1)
job-parts/build_git_deploy_test.sh (+1/-1)
job-parts/build_juju_deploy_single_charm.sh (+2/-2)
job-parts/build_mojo_runner.sh (+9/-5)
job-parts/build_osi.sh (+1/-1)
job-parts/deprecated/Z_DEPRECATE_build_mojo_runner_baremetal.sh (+0/-69)
job-parts/deprecated/part_juju_cleanup.sh (+0/-22)
job-parts/juju1_bighammer_destroy.sh (+32/-27)
job-parts/juju1_deploy_ok.sh (+45/-35)
job-parts/osci_job_common.sh (+33/-16)
job-parts/osci_mojo_common.sh (+21/-35)
job-parts/trigger_by_mojo_group.sh (+6/-0)
populate/mappings.yaml (+9/-7)
tools/juju_status_health_check.py (+1/-1)
tools/requirements.txt (+10/-0)
tools/tox.ini (+19/-0)
To merge this branch: bzr merge lp://qastaging/~1chb1n/ubuntu-openstack-ci/use-port-cleanup-tool
Reviewer Review Type Date Requested Status
Andrew McLeod (community) Approve
Review via email: mp+316399@code.qastaging.launchpad.net

Commit message

Update cleanup; use mojo from a venv; add ocata mapping

 - Use port-cleanup tool to delete neutron ext-ports left over from mojo runs. [Bug 1656306]
 - Update and re-enable undercloud instance reaping when error conditions are known. [Bug 1668778]
 - Block forever when destroy fails and cleanup fails, where human intervention is required anyway. [Bug 1668778]
 - Use mojo from a python virtualenv. [Bug 1666746]
 - Use python virtualenv for juju_status_health_check to work around paramiki/crypto IV CTR issues upstream. [Bug 1665598]

Description of the change

Update cleanup; use mojo from a venv; add ocata mapping

 - Use port-cleanup tool to delete neutron ext-ports left over from mojo runs. [Bug 1656306]
 - Update and re-enable undercloud instance reaping when error conditions are known. [Bug 1668778]
 - Block forever when destroy fails and cleanup fails, where human intervention is required anyway. [Bug 1668778]
 - Use mojo from a python virtualenv. [Bug 1666746]
 - Use python virtualenv for juju_status_health_check to work around paramiki/crypto IV CTR issues upstream. [Bug 1665598]

To post a comment you must log in.
Revision history for this message
Ryan Beisner (1chb1n) wrote :

Here is this in action in OSCI:
http://pastebin.ubuntu.com/23931679/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

Example of blocking forever w/o cleanup:
http://pastebin.ubuntu.com/24086467/

Example of automatically cleaning up that same type of error condition:
http://pastebin.ubuntu.com/24086472/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

# Example of automatic ERROR instance cleanup:
http://pastebin.ubuntu.com/24086476/

Revision history for this message
Ryan Beisner (1chb1n) wrote :

NOTE: UOSCI is running live on this branch and has been running on it since Feb 10.

406. By Ryan Beisner

Check that mojo manifest file exists before bootstrapping

407. By Ryan Beisner

Express or-true consistently in juju1* tools

Revision history for this message
Andrew McLeod (admcleod) wrote :

[Bug 1656306] - approve this MR on basis that a fix is released for this bug and confirmed functional
[Bug 1668778] - approve although this bug has not been 'fix released' it has been tested OK
[Bug 1666746] - approve, fix released and workaround validated
[Bug 1665598] - approve, fix released and validated by another user

On the basis of the notes for these bugs and a review of the diff below I give my +1 for this MR.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches