Merge into trunk : secgroup-cleanup : Code : ubuntu-openstack-ci

Status:	Merged
Merged at revision:	387
Proposed branch:	lp://qastaging/~1chb1n/ubuntu-openstack-ci/secgroup-cleanup
Merge into:	lp://qastaging/ubuntu-openstack-ci
Diff against target:	10421 lines (+3080/-2012) 137 files modified admin/902-reinstall-juju-all-slaves.sh (+39/-0) deployment/111-osci1-xenial.yaml (+4/-4) deployment/bin/100-jenkins-user.sh (+17/-11) deployment/jobs/_apt_maint_nodes/config.xml (+2/-1) deployment/jobs/_charm_whoami_check/config.xml (+2/-1) deployment/jobs/_juju_bighammer_destroy_this/config.xml (+14/-2) deployment/jobs/_juju_bootstrap_this/config.xml (+15/-1) deployment/jobs/_junk_matrix/config.xml (+45/-19) deployment/jobs/_no_op/config.xml (+160/-16) deployment/jobs/_tmp_cleanup_all_slaves/config.xml (+11/-5) deployment/jobs/amulet_full_matrix/config.xml (+3/-4) deployment/jobs/amulet_smoke_matrix/config.xml (+3/-4) deployment/jobs/charm_lint_matrix/config.xml (+2/-2) deployment/jobs/charm_pusher_aodh_master/config.xml (+10/-22) deployment/jobs/charm_pusher_aodh_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_barbican-softhsm_master/config.xml (+10/-22) deployment/jobs/charm_pusher_barbican-softhsm_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_barbican_master/config.xml (+10/-22) deployment/jobs/charm_pusher_barbican_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_ceilometer-agent_master/config.xml (+10/-22) deployment/jobs/charm_pusher_ceilometer-agent_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_ceilometer_master/config.xml (+10/-22) deployment/jobs/charm_pusher_ceilometer_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_ceph-fs_master/config.xml (+143/-0) deployment/jobs/charm_pusher_ceph-fs_stable/config.xml (+143/-0) deployment/jobs/charm_pusher_ceph-mon_master/config.xml (+10/-22) deployment/jobs/charm_pusher_ceph-mon_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_ceph-osd_master/config.xml (+10/-22) deployment/jobs/charm_pusher_ceph-osd_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_ceph-proxy_master/config.xml (+10/-22) deployment/jobs/charm_pusher_ceph-proxy_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_ceph-radosgw_master/config.xml (+10/-22) deployment/jobs/charm_pusher_ceph-radosgw_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_ceph_master/config.xml (+10/-22) deployment/jobs/charm_pusher_ceph_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_cinder-backup_master/config.xml (+10/-22) deployment/jobs/charm_pusher_cinder-backup_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_cinder-ceph_master/config.xml (+10/-22) deployment/jobs/charm_pusher_cinder-ceph_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_cinder_master/config.xml (+10/-22) deployment/jobs/charm_pusher_cinder_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_designate-bind_master/config.xml (+10/-22) deployment/jobs/charm_pusher_designate-bind_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_designate_master/config.xml (+10/-22) deployment/jobs/charm_pusher_designate_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_glance_master/config.xml (+10/-22) deployment/jobs/charm_pusher_glance_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_hacluster_master/config.xml (+10/-22) deployment/jobs/charm_pusher_hacluster_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_heat_master/config.xml (+10/-22) deployment/jobs/charm_pusher_heat_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_keystone_master/config.xml (+10/-22) deployment/jobs/charm_pusher_keystone_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_lxd_master/config.xml (+10/-22) deployment/jobs/charm_pusher_lxd_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_manila-generic_master/config.xml (+143/-0) deployment/jobs/charm_pusher_manila-generic_stable/config.xml (+143/-0) deployment/jobs/charm_pusher_manila_master/config.xml (+143/-0) deployment/jobs/charm_pusher_manila_stable/config.xml (+143/-0) deployment/jobs/charm_pusher_neutron-api-odl_master/config.xml (+10/-22) deployment/jobs/charm_pusher_neutron-api-odl_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_neutron-api_master/config.xml (+10/-22) deployment/jobs/charm_pusher_neutron-api_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_neutron-gateway_master/config.xml (+10/-22) deployment/jobs/charm_pusher_neutron-gateway_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_neutron-openvswitch_master/config.xml (+10/-22) deployment/jobs/charm_pusher_neutron-openvswitch_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_noop_debug/config.xml (+9/-21) deployment/jobs/charm_pusher_nova-cloud-controller_master/config.xml (+10/-22) deployment/jobs/charm_pusher_nova-cloud-controller_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_nova-compute-proxy_master/config.xml (+143/-0) deployment/jobs/charm_pusher_nova-compute-proxy_stable/config.xml (+143/-0) deployment/jobs/charm_pusher_nova-compute_master/config.xml (+10/-22) deployment/jobs/charm_pusher_nova-compute_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_odl-controller_master/config.xml (+10/-22) deployment/jobs/charm_pusher_odl-controller_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_openstack-dashboard_master/config.xml (+10/-22) deployment/jobs/charm_pusher_openstack-dashboard_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_openvswitch-odl_master/config.xml (+10/-22) deployment/jobs/charm_pusher_openvswitch-odl_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_percona-cluster_master/config.xml (+10/-22) deployment/jobs/charm_pusher_percona-cluster_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_rabbitmq-server_master/config.xml (+10/-22) deployment/jobs/charm_pusher_rabbitmq-server_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_swift-proxy_master/config.xml (+10/-22) deployment/jobs/charm_pusher_swift-proxy_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_swift-storage_master/config.xml (+10/-22) deployment/jobs/charm_pusher_swift-storage_stable/config.xml (+12/-24) deployment/jobs/charm_pusher_tempest_master/config.xml (+10/-22) deployment/jobs/charm_pusher_tempest_stable/config.xml (+12/-24) deployment/jobs/charm_single_matrix/config.xml (+2/-2) deployment/jobs/charm_unit_matrix/config.xml (+2/-2) deployment/jobs/deploy_with_deployer/config.xml (+2/-2) deployment/jobs/git_deploy_with_deployer/config.xml (+10/-5) deployment/jobs/lxd_matrix/config.xml (+2/-2) deployment/jobs/magpie_goose_matrix/config.xml (+133/-0) deployment/jobs/magpie_metal_matrix/config.xml (+133/-0) deployment/jobs/manual_trigger_deploy_with_deployer/config.xml (+7/-1) deployment/jobs/mojo_runner/config.xml (+13/-2) deployment/jobs/mojo_runner_baremetal/config.xml (+17/-3) deployment/jobs/multi_hv_matrix/config.xml (+2/-1) deployment/jobs/scheduled_trigger_amulet/config.xml (+4/-2) deployment/jobs/scheduled_trigger_deploy/config.xml (+4/-2) deployment/jobs/scheduled_trigger_lint/config.xml (+4/-2) deployment/jobs/scheduled_trigger_mojo_hot_all/config.xml (+4/-2) deployment/jobs/scheduled_trigger_mojo_hot_metal/config.xml (+4/-2) deployment/jobs/scheduled_trigger_mojo_hot_virtual/config.xml (+4/-2) deployment/jobs/scheduled_trigger_mojo_stable_deploy/config.xml (+4/-2) deployment/jobs/scheduled_trigger_single_charm/config.xml (+4/-2) deployment/jobs/scheduled_trigger_sourcedeploy_trusty_kilo/config.xml (+0/-130) deployment/jobs/scheduled_trigger_sourcedeploy_trusty_liberty/config.xml (+2/-2) deployment/jobs/scheduled_trigger_sourcedeploy_xenial_master/config.xml (+2/-2) deployment/jobs/scheduled_trigger_sourcedeploy_xenial_mitaka/config.xml (+2/-2) deployment/jobs/scheduled_trigger_sourcedeploy_xenial_newton/config.xml (+132/-0) deployment/jobs/scheduled_trigger_unit/config.xml (+4/-2) deployment/jobs/sim_sandbox_pipeline/config.xml (+1/-0) deployment/jobs/sim_sandbox_pipeline_full/config.xml (+1/-0) deployment/jobs/sparse_matrix/config.xml (+137/-0) deployment/jobs/temp_mojo_check/config.xml (+71/-0) deployment/jobs/test_charm_amulet_full/config.xml (+4/-55) deployment/jobs/test_charm_pipeline/config.xml (+1/-0) deployment/jobs/test_charm_pipeline_amulet_full/config.xml (+1/-0) deployment/jobs/test_charm_single/config.xml (+24/-14) job-parts/build_amulet_test.sh (+1/-3) job-parts/build_charm_pusher.sh (+2/-2) job-parts/build_mojo_runner.sh (+10/-8) job-parts/juju1_bighammer_destroy.sh (+14/-35) job-parts/osci_apt_common.sh (+35/-33) job-parts/osci_job_common.sh (+41/-12) job-parts/osci_juju_common.sh (+1/-0) job-parts/osci_jujudevel_common.sh (+2/-0) job-parts/osci_mojo_common.sh (+3/-1) job-parts/osci_openstack_common.sh (+0/-2) job-parts/osci_osi_common.sh (+6/-5) populate/mappings.yaml (+0/-8) tools/bundle_constrainer.py (+5/-0) tools/mp_comment.py (+5/-5)
To merge this branch:	bzr merge lp://qastaging/~1chb1n/ubuntu-openstack-ci/secgroup-cleanup
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Andrew McLeod	2016-11-14	Pending
Ubuntu OpenStack CI Team	2016-11-14	Pending
Review via email: mp+310809@code.qastaging.launchpad.net

Description of the change

Add secgroup cleanup and make changes for restricted sudo privileges

Juju destroy often leaves secgroups behind, eventually resulting in duplicate secgroup names, causing false failures in OSCI, such as:

https://openstack-ci-reports.ubuntu.com/artifacts/test_charm_pipeline/openstack/charm-swift-storage/397291/1/1199/consoleText.test_charm_amulet_smoke_2186.txt

This is really caused by a couple of bugs in Juju core:

- https://bugs.launchpad.net/juju-core/+bug/1333162
- https://bugs.launchpad.net/juju/+bug/1625624
- https://bugs.launchpad.net/juju/+bug/1570216

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2016-11-14:

#

Prior to a test job of this branch, slave #12 had a triplicate secgroup:

.

The test job subsequently ran into LP1625624 as has been observed:

00:11:02.185 WARNING cannot delete security group "juju-osci-sv12-0". Used by another environment?
00:11:31.360 WARNING cannot delete security group "juju-osci-sv12-1". Used by another environment?

.

But never fear. Our new janitor deleted the secgroups after juju destory 'completed'

00:13:16.988 ====> Deleting undercloud tenant's nova sec groups for osci-sv12 <=======================
00:13:19.712 3bc38f81-a5d1-4743-9a3c-d0a1b36c6dc9
00:13:21.927 +--------------------------------------+----------------+-------------+
00:13:21.927 | Id | Name | Description |
00:13:21.927 +--------------------------------------+----------------+-------------+
00:13:21.927 | 3bc38f81-a5d1-4743-9a3c-d0a1b36c6dc9 | juju-osci-sv12 | juju group |
00:13:21.927 +--------------------------------------+----------------+-------------+
00:13:21.973 3e0fae98-7cbe-4dc2-8935-c31e9102f8b9
00:13:23.859 +--------------------------------------+------------------+-------------+
00:13:23.859 | Id | Name | Description |
00:13:23.859 +--------------------------------------+------------------+-------------+
00:13:23.859 | 3e0fae98-7cbe-4dc2-8935-c31e9102f8b9 | juju-osci-sv12-0 | juju group |
00:13:23.859 +--------------------------------------+------------------+-------------+
00:13:23.906 32c67cd8-287c-4cf8-88ba-31fe028bffb0
00:13:25.654 +--------------------------------------+------------------+-------------+
00:13:25.654 | Id | Name | Description |
00:13:25.654 +--------------------------------------+------------------+-------------+
00:13:25.654 | 32c67cd8-287c-4cf8-88ba-31fe028bffb0 | juju-osci-sv12-1 | juju group |
00:13:25.654 +--------------------------------------+------------------+-------------+

.

Full test run console @ http://pastebin.ubuntu.com/23477353/.

Prior to a test job of this branch, slave #12 had a triplicate secgroup:

.

The test job subsequently ran into LP1625624 as has been observed:

00:11:02.185 WARNING cannot delete security group "juju-osci-sv12-0". Used by another environment?
00:11:31.360 WARNING cannot delete security group "juju-osci-sv12-1". Used by another environment?

.

But never fear.  Our new janitor deleted the secgroups after juju destory 'completed'

00:13:16.988 ====>  Deleting undercloud tenant's nova sec groups for osci-sv12  <=======================
00:13:19.712 3bc38f81-a5d1-4743-9a3c-d0a1b36c6dc9
00:13:21.927 +--------------------------------------+----------------+-------------+
00:13:21.927 | Id                                   | Name           | Description |
00:13:21.927 +--------------------------------------+----------------+-------------+
00:13:21.927 | 3bc38f81-a5d1-4743-9a3c-d0a1b36c6dc9 | juju-osci-sv12 | juju group  |
00:13:21.927 +--------------------------------------+----------------+-------------+
00:13:21.973 3e0fae98-7cbe-4dc2-8935-c31e9102f8b9
00:13:23.859 +--------------------------------------+------------------+-------------+
00:13:23.859 | Id                                   | Name             | Description |
00:13:23.859 +--------------------------------------+------------------+-------------+
00:13:23.859 | 3e0fae98-7cbe-4dc2-8935-c31e9102f8b9 | juju-osci-sv12-0 | juju group  |
00:13:23.859 +--------------------------------------+------------------+-------------+
00:13:23.906 32c67cd8-287c-4cf8-88ba-31fe028bffb0
00:13:25.654 +--------------------------------------+------------------+-------------+
00:13:25.654 | Id                                   | Name             | Description |
00:13:25.654 +--------------------------------------+------------------+-------------+
00:13:25.654 | 32c67cd8-287c-4cf8-88ba-31fe028bffb0 | juju-osci-sv12-1 | juju group  |
00:13:25.654 +--------------------------------------+------------------+-------------+

.

Full test run console @ http://pastebin.ubuntu.com/23477353/.

lp://qastaging/~1chb1n/ubuntu-openstack-ci/secgroup-cleanup updated on 2017-02-01

390. By Ryan Beisner on 2016-11-22

Add post-destroy info dump

391. By Ryan Beisner on 2016-11-22

Adjust for limited sudo privileges for the jenkins user

392. By Ryan Beisner on 2016-12-03

Remove shim for hashsum mismatch issue in Juju 1.25.6

- https://launchpad.net/bugs/1541482

393. By Ryan Beisner on 2016-12-03

Update pushers to address stable charm tool syntax change

- https://bugs.launchpad.net/charm-test-infra/+bug/1647000

- https://github.com/juju/charmstore-client/issues/104

- https://github.com/juju/docs/issues/1555

394. By Ryan Beisner on 2016-12-03

Fix bighammer destroyer juju binary call

395. By Ryan Beisner on 2016-12-09

Update mojo spec runner

396. By Ryan Beisner on 2016-12-09

Bail earlier if mojo operations fail

397. By Ryan Beisner on 2016-12-09

Update jenkins sudoers

398. By Ryan Beisner on 2016-12-09

Update jobs

399. By Ryan Beisner on 2017-01-04

Additional work-around for LP 1647000

400. By Ryan Beisner on 2017-01-05

Update juju upgrade work-around re: LP 1646909

401. By Ryan Beisner on 2017-01-05

Remove work-around for charm publish command change LP1647000

402. By Ryan Beisner on 2017-02-01

Update bundle constrainer and fix lint

Revision history for this message

Ryan Beisner (1chb1n) wrote on 2017-02-05:

#

OSCI has been running live on this branch since it was forked.

ubuntu-openstack-ci

Merge lp://qastaging/~1chb1n/ubuntu-openstack-ci/secgroup-cleanup into lp://qastaging/ubuntu-openstack-ci

Commit message

Description of the change

Preview Diff

Subscribers