Merge "[fuel] Turn off upload action & checkout"

diff --git a/jjb/fuel/fuel-build.sh b/jjb/fuel/fuel-build.sh
index e4a3041..2c0d12a 100755 (executable)
--- 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 f5bbd18..4d48ee5 100755 (executable)
--- 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