summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFedor Zhadaev <fzhadaev@mirantis.com>2016-11-02 15:17:05 +0300
committerFedor Zhadaev <fzhadaev@mirantis.com>2016-11-02 15:30:11 +0300
commit92a7ae0abedbf579d8720ecdfe938e74e39a92de (patch)
tree888f28cf1d828d0609e06384d5da17c65a60a3bc
parent27f7cb2c5f1946ec07309b045178f1627de3a89a (diff)
Prevent double uploading while "build" jobs
"build"-like jobs were matched to both if-statements so ISOs were uploaded twice. This patch fixes that behaviour. JIRA: FUEL-221 Change-Id: I1f6b18339ec742b65de6a3f3c1ae3c9a5009fa4e Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
-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
-