openstack
/
tripleo-ci
Code Issues Proposed changes

Do newton compatible bootstrap for multinode upgrades 

Prior to https://review.openstack.org/#/c/464667/ we were mixing
versions/releases for environment files.  Now we're not CI is
broken because deployed-server-bootstrap-environment-centos.yaml
doesn't exist on stable/newton t-h-t, so this reverts to using
the older bootstrap approach on that branch.

Change-Id: I3551456664daf89d01f98bde85d7fb22a01d4a03
Closes-Bug: #1691758
This commit is contained in:
Steven Hardy 2017-05-18 17:25:57 +01:00
parent 23aa3d8399
commit 36f86a2c98
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toci_gate_test-orig.sh
View File

@ -296,6 +296,10 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
if [ "$STABLE_RELEASE" = "newton" ]; then
BOOTSTRAP_SUBNODES_MINIMAL=0
elif [[ $TOCI_JOBTYPE =~ 'multinode-upgrades' && "$STABLE_RELEASE" = "ocata" ]] ; then
# When doing a multinode upgrade test, an ocata test starts by installing
# newton, so we need to do the newton compatible bootstrap
BOOTSTRAP_SUBNODES_MINIMAL=0
else
BOOTSTRAP_SUBNODES_MINIMAL=1
OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-bootstrap-environment-centos.yaml "