From d8e5d0c8f27322d44151a2f831f6ecd6373367ac Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Thu, 21 Dec 2017 15:24:37 +0100 Subject: [PATCH] Upgrades job not finding featureset file. The content of the variable $FEATURESET_FILE has changed, containing now the whole path to the featureset env file. Change-Id: Ie35b7055259866e0044c31502c47711e3c7d8d4a --- toci_gate_test-oooq.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/toci_gate_test-oooq.sh b/toci_gate_test-oooq.sh index b55277d51..d339082a0 100755 --- a/toci_gate_test-oooq.sh +++ b/toci_gate_test-oooq.sh @@ -134,6 +134,12 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do featureset*) FEATURESET_FILE="$LWD/config/general_config/$JOB_TYPE_PART.yml" FEATURESET_CONF="$FEATURESET_CONF --extra-vars @$FEATURESET_FILE" + + # Set UPGRADE_RELEASE if applicable + if is_featureset_mixed_upgrade "$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/$JOB_TYPE_PART.yml"; then + export UPGRADE_RELEASE=$(previous_release_from "$STABLE_RELEASE") + QUICKSTART_RELEASE="$QUICKSTART_RELEASE-undercloud-$UPGRADE_RELEASE-overcloud" + fi ;; ovb) OVB=1 @@ -192,11 +198,6 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do esac done -# Set UPGRADE_RELEASE if applicable -if is_featureset_mixed_upgrade "$TRIPLEO_ROOT/tripleo-quickstart/$FEATURESET_FILE"; then - export UPGRADE_RELEASE=$(previous_release_from "$STABLE_RELEASE") - QUICKSTART_RELEASE="$QUICKSTART_RELEASE-undercloud-$UPGRADE_RELEASE-overcloud" -fi if [[ ! -z $NODES_FILE ]]; then pushd $TRIPLEO_ROOT/tripleo-quickstart