openstack
/
tripleo-ci
Code Issues Proposed changes

Fix path for the multinode job when running the major upgrade. 

This submission fixes the environment path when running the
major upgrade.

We have two multinodes jobs, one running a major upgrade and
other not doing it.

Currently we make no distinction building the MULTINODE_ENV_PATH
depending if an upgrade will run.

This submission moves the conditional already used for the upgrades
scenarios to build the MULTINODE_ENV_PATH also for the multinode upgrades
job.

The current deployment builds the paths like:
-e /usr/share/openstack-tripleo-heat-templates/ci/environments/multinode.yaml
--templates /opt/stack/new/ocata//usr/share/openstack-tripleo-heat-templates

And after applying it:
-e /opt/stack/new/ocata/usr/share/openstack-tripleo-heat-templates/ci/environments/multinode.yaml
--templates /opt/stack/new/ocata//usr/share/openstack-tripleo-heat-templates

Closes-Bug:1687908
Change-Id: If88f403c85b79bd896a24c7816486709bd67706f
This commit is contained in:
Carlos Camacho 2017-05-04 16:11:32 +02:00 committed by Emilien Macchi
parent 6710eefc74
commit bb997040e1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toci_gate_test-orig.sh
View File

@ -127,15 +127,16 @@ if [[ $TOCI_JOBTYPE =~ scenario ]]; then
fi
export MULTINODE_ENV_NAME=${MULTINODE_ENV_NAME%-upgrades}
if [[ "$TOCI_JOBTYPE" =~ upgrades ]]; then
MULTINODE_ENV_PATH=$TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates/ci/environments/$MULTINODE_ENV_NAME.yaml
else
MULTINODE_ENV_PATH=/usr/share/openstack-tripleo-heat-templates/ci/environments/$MULTINODE_ENV_NAME.yaml
fi
else
export MULTINODE_ENV_NAME='multinode'
fi
if [[ $TOCI_JOBTYPE =~ upgrades ]]; then
MULTINODE_ENV_PATH=$TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates/ci/environments/$MULTINODE_ENV_NAME.yaml
else
MULTINODE_ENV_PATH=/usr/share/openstack-tripleo-heat-templates/ci/environments/$MULTINODE_ENV_NAME.yaml
fi
if [[ "$TOCI_JOBTYPE" =~ "periodic" && "$TOCI_JOBTYPE" =~ "-ha" ]]; then
TEST_OVERCLOUD_DELETE=1
elif [[ "$TOCI_JOBTYPE" =~ "periodic" && "$TOCI_JOBTYPE" =~ "-nonha" ]]; then