diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2017-05-30 14:51:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-30 14:51:06 +0000 |
| commit | da66c5fe3b78001f3f6300f063ae320f16bcc9bc (patch) | |
| tree | e63cdd74692adec7ab34c7162d6c1b4583e7d5ff | |
| parent | 429baae85b509029e1cb3505221dbc79b4216673 (diff) | |
| parent | 5395ba7dd1d8a87eaa2343f2efe062db9108be92 (diff) | |
Merge "[fuel] Turn off upload action & checkout"
| -rwxr-xr-x | jjb/fuel/fuel-build.sh | 1 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 2 |
2 files changed, 2 insertions, 1 deletions
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 |