Merge lp://qastaging/~1chb1n/ubuntu-openstack-ci/ss8-redeploy into lp://qastaging/ubuntu-openstack-ci
Proposed by
Ryan Beisner
| Status: | Merged |
|---|---|
| Merged at revision: | 392 |
| Proposed branch: | lp://qastaging/~1chb1n/ubuntu-openstack-ci/ss8-redeploy |
| Merge into: | lp://qastaging/ubuntu-openstack-ci |
| Diff against target: |
21600 lines (+3286/-14486) 210 files modified
.bzrignore (+9/-16) README.deploy (+0/-107) README.hacking (+0/-74) README.jobs (+0/-35) deploy-prep.sh (+0/-10) deploy/README.md (+11/-0) deploy/assets/bashrc (+0/-2) deploy/assets/environment-series.yaml (+1/-1) deploy/assets/environments.yaml (+1/-1) deploy/assets/osci-repo-boot-clean.sh (+6/-0) deploy/assets/osci-repo-boot.sh (+9/-0) deploy/assets/other_host_keys (+2/-0) deploy/assets/pip.conf (+1/-1) deploy/config/env-common (+28/-0) deploy/config/juju-apps/osci-lab.yaml (+4/-0) deploy/config/juju-apps/osci-master.yaml (+8/-0) deploy/config/juju-apps/osci-slave.yaml (+4/-0) deploy/config/juju-apps/osci-task.yaml (+4/-0) deploy/config/nets-and-models.yaml (+13/-24) deploy/jobs-static/_bak_jenkins_home_no_build_history/config.xml (+7/-18) deploy/jobs-static/_bootstrap/config.xml (+110/-0) deploy/jobs-static/_bucket_junk_cleanup/config.xml (+8/-19) deploy/jobs-static/_bucket_reset_object_headers/config.xml (+26/-86) deploy/jobs-static/_bucket_update_indices/config.xml (+9/-17) deploy/jobs-static/_destroy_controller/config.xml (+110/-0) deploy/jobs-static/_destroy_model/config.xml (+110/-0) deploy/jobs-static/_no_op/config.xml (+10/-158) deploy/jobs-static/_no_op2/config.xml (+25/-17) deploy/jobs-static/_no_op3/config.xml (+25/-17) deploy/jobs-static/_none/config.xml (+63/-0) deploy/jobs-static/_system_tools_init/config.xml (+10/-91) deploy/jobs-static/charm_build/config.xml (+34/-31) deploy/jobs-static/sim_sandbox_pipeline/config.xml (+49/-37) deploy/jobs-static/sim_sandbox_pipeline_full/config.xml (+20/-26) deploy/jobs-static/sim_sub_a/config.xml (+7/-18) deploy/jobs-static/sim_sub_b/config.xml (+11/-22) deploy/jobs-static/sim_sub_c/config.xml (+9/-20) deploy/jobs-static/sim_sub_d/config.xml (+9/-20) deploy/jobs-static/sim_sub_e/config.xml (+9/-20) deploy/jobs-static/test_charm_amulet_full/config.xml (+8/-16) deploy/jobs-static/test_charm_amulet_smoke/config.xml (+28/-25) deploy/jobs-static/test_charm_lint/config.xml (+9/-18) deploy/jobs-static/test_charm_pipeline/config.xml (+54/-51) deploy/jobs-static/test_charm_pipeline_amulet_full/config.xml (+45/-40) deploy/jobs-static/test_charm_single/config.xml (+12/-19) deploy/jobs-static/test_charm_unit/config.xml (+8/-18) deploy/lib/__init__.py (+3/-0) deploy/lib/osci_deploy_helpers.py (+355/-0) deploy/osci-controller-setup.sh (+19/-0) deploy/osci-float-all-instances.sh (+18/-0) deploy/osci-model-deploy.sh (+68/-0) deploy/osci-nets-and-models.py (+191/-547) deploy/osci-set-subnets-dns.sh (+14/-0) deploy/post-deploy/100-repo-boot.sh (+20/-0) deploy/post-deploy/101-ssh-imports.sh (+9/-0) deploy/post-deploy/102-ssh-creds.sh (+27/-28) deploy/post-deploy/103-cs-go-cookies.sh (+9/-15) deploy/post-deploy/104-dirs-and-packages.sh (+8/-21) deploy/post-deploy/105-novarc-artifactweb-credentials-distribute.sh (+12/-15) deploy/post-deploy/110-set-plugin-proxy-serverstack.sh (+14/-14) deploy/post-deploy/125-jobs-static-initial.sh (+19/-18) deploy/requirements.txt (+9/-0) deploy/templates/oscirc (+14/-0) deploy/tests/sample-juju-status.yaml (+591/-0) deploy/tox.ini (+33/-0) deploy/z-deprecated/100-jenkins-user.sh (+8/-8) deploy/z-deprecated/120-install-plugins.sh (+31/-32) deploy/z-deprecated/225-juju-gui-float.sh (+17/-18) deploy/z-deprecated/common/osci_utils.py (+3/-164) deploy/z-deprecated/dev/populate.py (+2/-1) deploy/z-deprecated/dev/scan_url_group.py (+1/-1) deploy/z-deprecated/tools/nova_instances_summarize.py (+1/-0) deploy/z-deprecated/tools/scan_branch_revs.py (+1/-0) deploy/z-deprecated/tools/scan_merge_props.py (+1/-0) deployment/111-osci1-xenial.yaml (+0/-63) deployment/jobs/charm_pusher_aodh_master/config.xml (+0/-143) deployment/jobs/charm_pusher_aodh_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_barbican-softhsm_master/config.xml (+0/-143) deployment/jobs/charm_pusher_barbican-softhsm_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_barbican_master/config.xml (+0/-143) deployment/jobs/charm_pusher_barbican_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_ceilometer-agent_master/config.xml (+0/-143) deployment/jobs/charm_pusher_ceilometer-agent_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_ceilometer_master/config.xml (+0/-143) deployment/jobs/charm_pusher_ceilometer_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph-fs_master/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph-fs_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph-mon_master/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph-mon_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph-osd_master/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph-osd_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph-proxy_master/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph-proxy_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph-radosgw_master/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph-radosgw_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph_master/config.xml (+0/-143) deployment/jobs/charm_pusher_ceph_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_cinder-backup_master/config.xml (+0/-143) deployment/jobs/charm_pusher_cinder-backup_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_cinder-ceph_master/config.xml (+0/-143) deployment/jobs/charm_pusher_cinder-ceph_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_cinder_master/config.xml (+0/-143) deployment/jobs/charm_pusher_cinder_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_designate-bind_master/config.xml (+0/-143) deployment/jobs/charm_pusher_designate-bind_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_designate_master/config.xml (+0/-143) deployment/jobs/charm_pusher_designate_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_glance_master/config.xml (+0/-143) deployment/jobs/charm_pusher_glance_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_hacluster_master/config.xml (+0/-143) deployment/jobs/charm_pusher_hacluster_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_heat_master/config.xml (+0/-143) deployment/jobs/charm_pusher_heat_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_keystone-ldap_master/config.xml (+0/-143) deployment/jobs/charm_pusher_keystone-ldap_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_keystone_master/config.xml (+0/-143) deployment/jobs/charm_pusher_keystone_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_lxd_master/config.xml (+0/-143) deployment/jobs/charm_pusher_lxd_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_manila-generic_master/config.xml (+0/-143) deployment/jobs/charm_pusher_manila-generic_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_manila_master/config.xml (+0/-143) deployment/jobs/charm_pusher_manila_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_neutron-api-odl_master/config.xml (+0/-143) deployment/jobs/charm_pusher_neutron-api-odl_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_neutron-api_master/config.xml (+0/-143) deployment/jobs/charm_pusher_neutron-api_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_neutron-gateway_master/config.xml (+0/-143) deployment/jobs/charm_pusher_neutron-gateway_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_neutron-openvswitch_master/config.xml (+0/-143) deployment/jobs/charm_pusher_neutron-openvswitch_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_noop_debug/config.xml (+0/-143) deployment/jobs/charm_pusher_nova-cloud-controller_master/config.xml (+0/-143) deployment/jobs/charm_pusher_nova-cloud-controller_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_nova-compute-proxy_master/config.xml (+0/-143) deployment/jobs/charm_pusher_nova-compute-proxy_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_nova-compute_master/config.xml (+0/-143) deployment/jobs/charm_pusher_nova-compute_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_odl-controller_master/config.xml (+0/-143) deployment/jobs/charm_pusher_odl-controller_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_openstack-dashboard_master/config.xml (+0/-143) deployment/jobs/charm_pusher_openstack-dashboard_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_openvswitch-odl_master/config.xml (+0/-143) deployment/jobs/charm_pusher_openvswitch-odl_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_percona-cluster_master/config.xml (+0/-143) deployment/jobs/charm_pusher_percona-cluster_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_rabbitmq-server_master/config.xml (+0/-143) deployment/jobs/charm_pusher_rabbitmq-server_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_swift-proxy_master/config.xml (+0/-143) deployment/jobs/charm_pusher_swift-proxy_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_swift-storage_master/config.xml (+0/-143) deployment/jobs/charm_pusher_swift-storage_stable/config.xml (+0/-143) deployment/jobs/charm_pusher_tempest_master/config.xml (+0/-143) deployment/jobs/charm_pusher_tempest_stable/config.xml (+0/-143) deployment/post-deploy.sh (+0/-39) env-common (+0/-28) operate/bare-copy-jobs.sh (+21/-15) operate/maint-relation-jig.sh (+17/-0) run/Makefile (+5/-1) run/job-parts/build_amulet_smoke.sh (+7/-8) run/job-parts/build_amulet_test.sh (+22/-34) run/job-parts/build_bak.sh (+14/-0) run/job-parts/build_bucket_junk_cleanup.sh (+18/-30) run/job-parts/build_bucket_reset_object_headers.sh (+3/-3) run/job-parts/build_bucket_update_indices.sh (+3/-2) run/job-parts/build_charm_build_and_archive.sh (+2/-2) run/job-parts/build_charm_pusher.sh (+3/-3) run/job-parts/build_charm_single.sh (+77/-86) run/job-parts/build_cs_deploy_charm.sh (+12/-0) run/job-parts/build_deploy_test.sh (+3/-4) run/job-parts/build_gerrit_change_ci_sandbox.sh (+2/-2) run/job-parts/build_git_deploy_test.sh (+3/-4) run/job-parts/build_juju_bootstrap.sh (+4/-0) run/job-parts/build_juju_destroy_controller.sh (+4/-0) run/job-parts/build_juju_destroy_model.sh (+4/-0) run/job-parts/build_lint_test.sh (+6/-31) run/job-parts/build_mojo_runner.sh (+3/-19) run/job-parts/build_none.sh (+3/-0) run/job-parts/build_prescribe.sh (+2/-2) run/job-parts/build_simulate.sh (+4/-5) run/job-parts/build_unit_test.sh (+22/-26) run/job-parts/deprecated/build_deployer_quickcheck.sh (+2/-3) run/job-parts/deprecated/build_juju_bootstrap.sh (+2/-2) run/job-parts/deprecated/build_juju_deploy_single_charm.sh (+4/-4) run/job-parts/deprecated/build_juju_stat.sh (+2/-2) run/job-parts/deprecated/build_maint_nodes.sh (+1/-1) run/job-parts/deprecated/build_nova_list_overcloud.sh (+1/-1) run/job-parts/deprecated/build_nova_list_undercloud.sh (+1/-1) run/job-parts/deprecated/build_osi.sh (+2/-2) run/job-parts/deprecated/build_sync_gh2lp.sh (+1/-1) run/job-parts/deprecated/build_sync_lp2gh.sh (+1/-1) run/job-parts/deprecated/juju1_bighammer_destroy.sh (+2/-2) run/job-parts/deprecated/osci_apt_common.sh (+0/-62) run/job-parts/deprecated/trigger_by_branch_scanner.sh (+1/-1) run/job-parts/deprecated/trigger_by_mojo_group.sh (+1/-1) run/job-parts/deprecated/trigger_by_mp_scanner.sh (+1/-1) run/job-parts/func_exec.sh (+5/-3) run/job-parts/get_pkg_info.sh (+1/-1) run/job-parts/osci_gerrit_common.sh (+5/-15) run/job-parts/osci_job_common.sh (+221/-402) run/job-parts/osci_juju1_common.sh (+92/-0) run/job-parts/osci_layerci_common.sh (+19/-0) run/job-parts/osci_mojo_common.sh (+1/-1) run/job-parts/osci_openstack_common.sh (+142/-213) run/job-parts/osci_repos_common.sh (+66/-90) run/job-parts/part_gerrit_review.sh (+3/-3) run/job-parts/part_workspace_cleanup.sh (+1/-1) run/populate/deprecated/create_credentials.py (+5/-5) run/test-requirements.txt (+1/-0) run/tox.ini (+14/-6) |
| To merge this branch: | bzr merge lp://qastaging/~1chb1n/ubuntu-openstack-ci/ss8-redeploy |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrew McLeod (community) | Approve | ||
|
Review via email:
|
|||
Commit message
[1chb1n, r=admcleod] Refactor for redeploy on serverstack8 with Juju2 below and on top
Rearrange directories to separate run-time from deploy-time
Switch to scripted deploy due to fat pack deb needs of the jenkins charms
Update deploy scripts
Refactor helpers
Update tox config
Refactor openstack client usage for ksv3
Update post-deploy scripts
Add func_exec tox coverage
Update charm-test-infra usage
Activate clients for gerrit review builder part
Update bucket junk cleanup
Remove references to juju1 bighammer destroyer
Move rsync backup snipped from job to script
Clean up lint runner script
Add layerci_
Add destroy builder
Add bootstrap builder
Update post-destroy info dump and juju status
Update juju-wait calls
Add cs_deploy_charm builder
Update amulet runners
Update amulet full runner
Use updated log puller
Update charm single runner for config file name
Description of the change
Beware - this was a major refactor and deprecation of a ton of legacy things.
OSCI has been running live on this since April, and gate jobs are A-OK.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Lvvl>M +1