From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Tue, 30 May 2017 10:36:55 +0000 (+0400)
Subject: [fuel] Turn off upload action & checkout
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=5395ba7dd1d8a87eaa2343f2efe062db9108be92

[fuel] Turn off upload action & checkout

* turn off non-existent artifacts upload
* use latest commit in master since there is no iso/image
  for mcp based deployments yet

Change-Id: Ib92680ef9838fc2e11d61c806dfd9728514c364e
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---

diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh
index e4a3041ff..2c0d12a80 100755
--- a/jjb/fuel/fuel-build.sh
+++ b/jjb/fuel/fuel-build.sh
@@ -10,6 +10,7 @@
 
 # disable Fuel iso build for master branch
 if [[ "$BRANCH" == 'master' ]]; then
+    touch $WORKSPACE/.noupload
     echo "--------------------------------------------------------"
     echo "Done!"
     exit 0
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index f5bbd1818..4d48ee587 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -21,7 +21,7 @@ echo "Using ${OPNFV_ARTIFACT_URL/*\/} for deployment"
 if [[ "$JOB_NAME" =~ "merge" ]]; then
     # set simplest scenario for virtual deploys to run for merges
     DEPLOY_SCENARIO="os-nosdn-nofeature-ha"
-else
+elif [[ "$BRANCH" != 'master' ]]; then
     # for none-merge deployments
     # checkout the commit that was used for building the downloaded artifact
     # to make sure the ISO and deployment mechanism uses same versions