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
This commit is contained in:
parent
7a2edf70ec
commit
d8e5d0c8f2
@ -134,6 +134,12 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
|||||||
featureset*)
|
featureset*)
|
||||||
FEATURESET_FILE="$LWD/config/general_config/$JOB_TYPE_PART.yml"
|
FEATURESET_FILE="$LWD/config/general_config/$JOB_TYPE_PART.yml"
|
||||||
FEATURESET_CONF="$FEATURESET_CONF --extra-vars @$FEATURESET_FILE"
|
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)
|
||||||
OVB=1
|
OVB=1
|
||||||
@ -192,11 +198,6 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
|||||||
esac
|
esac
|
||||||
done
|
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
|
if [[ ! -z $NODES_FILE ]]; then
|
||||||
pushd $TRIPLEO_ROOT/tripleo-quickstart
|
pushd $TRIPLEO_ROOT/tripleo-quickstart
|
||||||
|
Loading…
Reference in New Issue
Block a user