From 92a7ae0abedbf579d8720ecdfe938e74e39a92de Mon Sep 17 00:00:00 2001 From: Fedor Zhadaev Date: Wed, 2 Nov 2016 15:17:05 +0300 Subject: 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 --- jjb/fuel/fuel-upload-artifact.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'jjb/fuel/fuel-upload-artifact.sh') 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 - -- cgit 1.2.3-korg