summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2016-11-07 13:34:19 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-07 13:34:19 +0000
commit24fcd3737ab864b8e0368663c911ce9c19efa466 (patch)
treefcfa3690b117026f82b136aa5e48dbbc0f6e2a2c /jjb
parenta85837f753e05cdd31cdccfdb72fe05b29f7d824 (diff)
parent92a7ae0abedbf579d8720ecdfe938e74e39a92de (diff)
Merge "Prevent double uploading while "build" jobs"
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/fuel/fuel-upload-artifact.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/jjb/fuel/fuel-upload-artifact.sh b/jjb/fuel/fuel-upload-artifact.sh
index 1ccd3282c..ca4ba00b0 100755
--- a/jjb/fuel/fuel-upload-artifact.sh
+++ b/jjb/fuel/fuel-upload-artifact.sh
@@ -108,13 +108,11 @@ echo
nfsstore
-if [[ ! "$JOB_NAME" =~ merge ]]; then
+if [[ "$JOB_NAME" =~ merge ]]; then
+ uploadiso
+elif [[ "$JOB_NAME" =~ build ]]; then
importkey
signiso
uploadiso
fi
-if [[ ! "$JOB_NAME" =~ verify ]]; then
- uploadiso
-fi
-