diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-02-27 11:44:36 +0000 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-02-27 11:44:36 +0000 |
| commit | 2a202ed81e0a3b9995137369d10adac7faf26c62 (patch) | |
| tree | f6e255eb16b8c9b11f0463f2985bcfc2476b3d77 | |
| parent | 71344691122d6445b2d9d885ff8a379c1d700382 (diff) | |
xci: Set the scenario to os-nosdn-nofeature if the verify is skipped
The envInject complains due to nonexistent scenario.properties so we
set the scenario to os-nosdn-nofeature to suppress the failures since
there is nothing to fail.
Change-Id: Ic259ec53e77cf8afe62638a1b447c8e58863b419
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
| -rwxr-xr-x | jjb/xci/xci-set-scenario.sh | 10 |
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 |