Merge "Add check to enable additional ansible tag for updates"

This commit is contained in:
Zuul 2018-02-15 15:21:40 +00:00 committed by Gerrit Code Review
commit 349736c83e
2 changed files with 9 additions and 0 deletions

View File

@ -32,6 +32,12 @@ function is_featureset_mixed_upgrade {
[ $(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 {
# First parameter is the START_JOB_TIME
# Second is the command to be executed

View File

@ -135,6 +135,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
# Run overcloud-upgrade tag only in upgrades jobs
TAGS="$TAGS,overcloud-upgrade"
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=1