openstack/openstack-ansible
Code Issues Proposed changes

Replace meta job map for aio->aio_lxc with simpler mechanism

Browse Source 
The job map does not appear to be working as it was designed
to as the pike->queens upgrades are failing due to an incorrect
scenario name being given to the pike bootstrap process.

The patch also correctly sets the scenario for the jobs that
run, and also replaces the mapping with a simpler mechanism in
the gate-check-commit script.

Change-Id: I384df79df83b04adfd7ba002ce54b9044c6df5e1
This commit is contained in:
Jesse Pretorius 2018-03-06 12:11:24 +00:00
parent 54870ed2a6
commit 319a8fd2a3
2 changed files with 13 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/gate-check-commit.sh
View File

@ -61,7 +61,17 @@ export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/pike'}
# deployment.
# This needs to be done before the first "source" to ensure
# the correct functions are used for the branch.
# Also, in queens the 'aio' scenario was renamed to aio_lxc
# so we handle ensuring that the pike checkout understands
# which scenario it needs to use.
if [[ "${ACTION}" == "upgrade" ]]; then
# Convert the scenario from a queens name
# to a pike name
if [[ "${SCENARIO}" == "aio_lxc" ]]; then
export SCENARIO="aio"
fi
# Store the target SHA/branch
export UPGRADE_TARGET_BRANCH=$(git rev-parse HEAD)

44
zuul.d/jobs.yaml
View File

@ -77,7 +77,7 @@
timeout: 10800
vars:
action: upgrade
scenario: aio
scenario: aio_lxc
- job:
name: openstack-ansible-upgrade-ceph-ubuntu-xenial
@ -121,7 +121,7 @@
timeout: 10800
vars:
action: upgrade
scenario: aio
scenario: aio_lxc
- job:
name: openstack-ansible-upgrade-ceph-centos-7
@ -151,42 +151,4 @@
timeout: 10800
vars:
action: upgrade
scenario: aio
# NOTE(cloudnull): META JOB MAP
# In order to cater for the possibility that an external job was dependent on the old job name
# the following job items are used to repoint work to the updated job name should the old name
# be referenced. As we updated our zuul dependencies and external job runners these items should
# be removed as soon as they're no longer needed.
- job:
name: openstack-ansible-varstest-aio-ubuntu-xenial
parent: openstack-ansible-varstest-aio_lxc-ubuntu-xenial
- job:
name: openstack-ansible-deploy-aio-ubuntu-xenial
parent: openstack-ansible-deploy-aio
- job:
name: openstack-ansible-upgrade-aio-ubuntu-xenial
parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
- job:
name: openstack-ansible-deploy-aio-centos-7
parent: openstack-ansible-deploy-aio_lxc-centos-7
- job:
name: openstack-ansible-upgrade-aio-centos-7
parent: openstack-ansible-upgrade-aio_lxc-centos-7
- job:
name: openstack-ansible-deploy-aio-opensuse-423
parent: openstack-ansible-deploy-aio_lxc-opensuse-423
- job:
name: openstack-ansible-deploy-ceph-opensuse-423
parent: openstack-ansible-deploy-aio_lxc-opensuse-423
- job:
name: openstack-ansible-upgrade-aio-opensuse-423
parent: openstack-ansible-deploy-aio_lxc-opensuse-423
scenario: aio_lxc