Merge "Add check to enable additional ansible tag for updates"
This commit is contained in:
commit
349736c83e
|
@ -32,6 +32,12 @@ function is_featureset_mixed_upgrade {
|
||||||
[ $(shyaml get-value mixed_upgrade "False"< $FEATURESET_FILE) = "True" ]
|
[ $(shyaml get-value mixed_upgrade "False"< $FEATURESET_FILE) = "True" ]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function is_featureset_overcloud_update {
|
||||||
|
local FEATURESET_FILE="$1"
|
||||||
|
|
||||||
|
[ $(shyaml get-value overcloud_update "False"< $FEATURESET_FILE) = "True" ]
|
||||||
|
}
|
||||||
|
|
||||||
function run_with_timeout {
|
function run_with_timeout {
|
||||||
# First parameter is the START_JOB_TIME
|
# First parameter is the START_JOB_TIME
|
||||||
# Second is the command to be executed
|
# Second is the command to be executed
|
||||||
|
|
|
@ -135,6 +135,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||||
# Run overcloud-upgrade tag only in upgrades jobs
|
# Run overcloud-upgrade tag only in upgrades jobs
|
||||||
TAGS="$TAGS,overcloud-upgrade"
|
TAGS="$TAGS,overcloud-upgrade"
|
||||||
fi
|
fi
|
||||||
|
if is_featureset_overcloud_update "$TRIPLEO_ROOT/tripleo-quickstart/config/general_config/$JOB_TYPE_PART.yml"; then
|
||||||
|
TAGS="$TAGS,overcloud-update"
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
ovb)
|
ovb)
|
||||||
OVB=1
|
OVB=1
|
||||||
|
|
Loading…
Reference in New Issue