summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fdegir@gmail.com>2018-02-27 11:57:01 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-27 11:57:01 +0000
commit754aac40df373cda74bf64bb830d8d5acd65a2c5 (patch)
treeff59261f04bfcbdbda17b93edd4c7eca6490a147
parentc58bb46d65aea8913f41f2c395696adce376af79 (diff)
parent2a202ed81e0a3b9995137369d10adac7faf26c62 (diff)
Merge "xci: Set the scenario to os-nosdn-nofeature if the verify is skipped"
-rwxr-xr-xjjb/xci/xci-set-scenario.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/jjb/xci/xci-set-scenario.sh b/jjb/xci/xci-set-scenario.sh
index 4fffafbbb..59205e291 100755
--- a/jjb/xci/xci-set-scenario.sh
+++ b/jjb/xci/xci-set-scenario.sh
@@ -17,11 +17,16 @@ set -o pipefail
# what you are doing.
#----------------------------------------------------------------------
+WORK_DIRECTORY=/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO
+/bin/rm -rf $WORK_DIRECTORY && mkdir -p $WORK_DIRECTORY
+
# ensure GERRIT_TOPIC is set
GERRIT_TOPIC="${GERRIT_TOPIC:-''}"
+
# skip the healthcheck if the patch doesn't impact the deployment
if [[ "$GERRIT_TOPIC" =~ skip-verify|skip-deployment ]]; then
- echo "Skipping the healthcheck!"
+ echo "Skipping verify!"
+ echo "DEPLOY_SCENARIO=os-nosdn-nofeature" > $WORK_DIRECTORY/scenario.properties
exit 0
fi
@@ -37,9 +42,6 @@ if [[ $GERRIT_PROJECT != "releng-xci" ]]; then
chmod -R go-rwx $WORKSPACE/xci/scripts/vm
fi
-WORK_DIRECTORY=/tmp/$GERRIT_CHANGE_NUMBER/$DISTRO
-/bin/rm -rf $WORK_DIRECTORY && mkdir -p $WORK_DIRECTORY
-
# if change is coming to releng-xci, continue as usual until that part is fixed as well
if [[ $GERRIT_PROJECT == "releng-xci" ]]; then
# save the scenario name into java properties file to be injected to downstream jobs via envInject