X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-download-artifact.sh;h=d78ddc5ba49e1155571e8a0069595f6474c0b21f;hb=3d9e731de7a9343cbc489bd7551ae34e408f2d0d;hp=7ebc0d6d010e939b6411e0308b4a48964331d227;hpb=5a7a6a6c48511dd8d53defe64609edc88d4999bb;p=releng.git

diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh
index 7ebc0d6d0..d78ddc5ba 100755
--- a/jjb/fuel/fuel-download-artifact.sh
+++ b/jjb/fuel/fuel-download-artifact.sh
@@ -1,24 +1,54 @@
 #!/bin/bash
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2016 Ericsson AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
 set -o errexit
-set -o nounset
 set -o pipefail
 
-if [[ $GERRIT_EVENT_TYPE = "change-merged" ]]; then
+if [[ "$JOB_NAME" =~ "merge" ]]; then
+    echo "Downloading http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties"
     # get the properties file for the Fuel ISO built for a merged change
-    curl -s -o $WORKSPACE/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties http://$GS_URL/latest.properties
+    curl -s -o $WORKSPACE/latest.properties http://$GS_URL/opnfv-gerrit-$GERRIT_CHANGE_NUMBER.properties
 else
     # get the latest.properties file in order to get info regarding latest artifact
+    echo "Downloading http://$GS_URL/latest.properties"
     curl -s -o $WORKSPACE/latest.properties http://$GS_URL/latest.properties
 fi
 
 # check if we got the file
 [[ -f latest.properties ]] || exit 1
 
-# source the file so we get OPNFV vars
+# source the file so we get artifact metadata
 source latest.properties
 
+# echo the info about artifact that is used during the deployment
+OPNFV_ARTIFACT=${OPNFV_ARTIFACT_URL/*\/}
+echo "Using $OPNFV_ARTIFACT for deployment"
+
+# using ISOs for verify & merge jobs from local storage will be enabled later
+if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then
+    # check if we already have the ISO to avoid redownload
+    ISOSTORE="/iso_mount/opnfv_ci/${GIT_BRANCH##*/}"
+    if [[ -f "$ISOSTORE/$OPNFV_ARTIFACT" ]]; then
+        echo "ISO exists locally. Skipping the download and using the file from ISO store"
+        ln -s $ISOSTORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.iso
+        echo "--------------------------------------------------------"
+        echo
+        ls -al $WORKSPACE/opnfv.iso
+        echo
+        echo "--------------------------------------------------------"
+        echo "Done!"
+        exit 0
+    fi
+fi
+
 # log info to console
-echo "Downloading the $INSTALLER artifact using URL http://$OPNFV_ARTIFACT_URL"
+echo "Downloading the $INSTALLER_TYPE artifact using URL http://$OPNFV_ARTIFACT_URL"
 echo "This could take some time..."
 echo "--------------------------------------------------------"
 echo