From: Jun Li <matthew.lijun@huawei.com>
Date: Fri, 5 Feb 2016 09:35:16 +0000 (+0000)
Subject: Merge "compass: Adjust jjb and scripts"
X-Git-Tag: brahmaputra.1.0~63
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f1b5edef0df34e0313593d9a3d6a7fdd7061306c;hp=0c1ce8c1ae00de21c813b18ffd5c7d6b0cc00c7e;p=releng.git

Merge "compass: Adjust jjb and scripts"
---

diff --git a/jjb/fuel/fuel-download-artifact.sh b/jjb/fuel/fuel-download-artifact.sh
index ceac859dd..d78ddc5ba 100755
--- a/jjb/fuel/fuel-download-artifact.sh
+++ b/jjb/fuel/fuel-download-artifact.sh
@@ -36,7 +36,7 @@ if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then
     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"
-        /bin/cp -f $ISOSTORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.iso
+        ln -s $ISOSTORE/$OPNFV_ARTIFACT $WORKSPACE/opnfv.iso
         echo "--------------------------------------------------------"
         echo
         ls -al $WORKSPACE/opnfv.iso
diff --git a/jjb/fuel/fuel-upload-artifact.sh b/jjb/fuel/fuel-upload-artifact.sh
index 6dd5f34d6..47cf8985c 100755
--- a/jjb/fuel/fuel-upload-artifact.sh
+++ b/jjb/fuel/fuel-upload-artifact.sh
@@ -29,17 +29,17 @@ if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then
         ls -tp | grep -v '/' | tail -n +6 | xargs -d '\n' /bin/rm -f --
 
         # store ISO
-        echo "Storing $INSTALLER_TYPE artifact on NFS first"
+        echo "Storing $INSTALLER_TYPE artifact on NFS..."
         /bin/cp -f $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso \
             $ISOSTORE/opnfv-$OPNFV_ARTIFACT_VERSION.iso
     fi
 fi
 
 # log info to console
-echo
 echo "Uploading $INSTALLER_TYPE artifact. This could take some time..."
 echo
 
+cd $WORKSPACE
 # upload artifact and additional files to google storage
 gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso \
     gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1