From: MatthewLi <matthew.lijun@huawei.com>
Date: Fri, 23 Dec 2016 03:15:59 +0000 (-0500)
Subject: dovetail: bugfix for gsutil cp
X-Git-Tag: danube.1.0~515
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=59f96c0b4fb704339bf45c8af943070f6adcf7b9;p=releng.git

dovetail: bugfix for gsutil cp

JIRA: DOVETAIL-164

Change-Id: Ibb035d7d791eab510e833f572b86cd084592d898
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
---

diff --git a/jjb/dovetail/dovetail-artifacts-upload.sh b/jjb/dovetail/dovetail-artifacts-upload.sh
index 84abea11e..ce02dd569 100755
--- a/jjb/dovetail/dovetail-artifacts-upload.sh
+++ b/jjb/dovetail/dovetail-artifacts-upload.sh
@@ -18,7 +18,7 @@ sudo docker pull ${DOCKER_REPO_NAME}:${DOCKER_TAG}
 sudo docker save -o ${STORE_FILE_NAME} ${DOCKER_REPO_NAME}:${DOCKER_TAG}
 
 OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S")
-GS_UPLOAD_LOCATION="gs://$GS_URL/$OPNFV_ARTIFACT_VERSION"
+GS_UPLOAD_LOCATION="${STORE_URL}/${OPNFV_ARTIFACT_VERSION}"
 (
     echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION"
     echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
@@ -57,7 +57,7 @@ echo
 cd $WORKSPACE
 # upload artifact and additional files to google storage
 gsutil cp ${CACHE_DIR}/${STORE_FILE_NAME} \
-${STORE_URL}/${STORE_FILE_NAME} > gsutil.file.log 2>&1
+${STORE_URL}/${STORE_FILE_NAME} > gsutil.dockerfile.log 2>&1
 gsutil cp $WORKSPACE/opnfv.properties \
 ${STORE_URL}/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1
 gsutil cp $WORKSPACE/opnfv.properties \