diff options
| author |   MatthewLi <matthew.lijun@huawei.com> | 2016-12-22 02:14:50 -0500 |
|---|---|---|
| committer | MatthewLi <matthew.lijun@huawei.com> | 2016-12-22 02:16:01 -0500 |
| commit | d5b7d895d1d42f515c4e36fa41ec951bfd1cbc09 (patch) | |
| tree | 16df089039292ae7f718856ca8fbe75573c085e4 /jjb/dovetail | |
| parent | c6311f43a1d0bb366f9a789af49beb8c1fd9779e (diff) | |
dovetail: bugfix for gsutil upload
JIRA: DOVETAIL-164
Change-Id: I49b119490f0dcbd20b7ea56289e5d629d4ab6f89
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'jjb/dovetail')
| -rwxr-xr-x | jjb/dovetail/dovetail-artifacts-upload.sh | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/jjb/dovetail/dovetail-artifacts-upload.sh b/jjb/dovetail/dovetail-artifacts-upload.sh index 94e4129fc..84abea11e 100755 --- a/jjb/dovetail/dovetail-artifacts-upload.sh +++ b/jjb/dovetail/dovetail-artifacts-upload.sh @@ -17,6 +17,17 @@ cd ${CACHE_DIR} 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" +( + echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION" + echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)" + echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)" + echo "OPNFV_ARTIFACT_URL=$GS_UPLOAD_LOCATION" + echo "OPNFV_BUILD_URL=$BUILD_URL" +) > $WORKSPACE/opnfv.properties +source $WORKSPACE/opnfv.properties + importkey () { # clone releng repository echo "Cloning releng repository..." @@ -45,7 +56,18 @@ echo cd $WORKSPACE # upload artifact and additional files to google storage -gsutil cp ${CACHE_DIR}/${STORE_FILE_NAME} ${STORE_URL}/${STORE_FILE_NAME} +gsutil cp ${CACHE_DIR}/${STORE_FILE_NAME} \ +${STORE_URL}/${STORE_FILE_NAME} > gsutil.file.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 \ + ${STORE_URL}/latest.properties > gsutil.latest.log 2>&1 + +gsutil -m setmeta \ + -h "Content-Type:text/html" \ + -h "Cache-Control:private, max-age=0, no-transform" \ + ${STORE_URL}/latest.properties \ + ${STORE_URL}/opnfv-$OPNFV_ARTIFACT_VERSION.properties > /dev/null 2>&1 gsutil -m setmeta \ -h "Cache-Control:private, max-age=0, no-transform" \ |