From d5ba8c5a34a97d365da24715de055d069900027b Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Fri, 9 Feb 2018 11:39:33 +0100 Subject: [PATCH] Add check to enable additional ansible tag for updates This will make sure we only go through the update tasks in jobs which need it. Change-Id: Ia6b4daeeb1924af5de7598c4a42b5ccf1d13d1de --- scripts/oooq_common_functions.sh | 6 ++++++ toci_gate_test-oooq.sh | 3 +++ 2 files changed, 9 insertions(+) diff --git a/scripts/oooq_common_functions.sh b/scripts/oooq_common_functions.sh index 85746a015..2d91ad626 100644 --- a/scripts/oooq_common_functions.sh +++ b/scripts/oooq_common_functions.sh @@ -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 diff --git a/toci_gate_test-oooq.sh b/toci_gate_test-oooq.sh index 8fa5f5d1c..ca16becaa 100755 --- a/toci_gate_test-oooq.sh +++ b/toci_gate_test-oooq.sh @@ -141,6 +141,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