summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-09-07 12:36:40 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-07 12:36:40 +0000
commit98f7e8c3fc7a5efb6aa8b8ec3833ab8f3fa672b0 (patch)
tree955df1f7ad22e967f7c9e1112afeef7015b5ef4c
parent605de0faa6064fe7c698c0af94554db6f1a59f31 (diff)
parent855b5927c98ea67fda0cec1fedd76aea66b96414 (diff)
Merge "kvmfornfv: Use correct url for uploading artifacts"
-rwxr-xr-xjjb/kvmfornfv/kvmfornfv-upload-artifact.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh b/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh
index 422626ead..6f8fff3ff 100755
--- a/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh
+++ b/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh
@@ -35,6 +35,7 @@ esac
echo "OPNFV_ARTIFACT_URL=$GS_UPLOAD_LOCATION"
echo "OPNFV_BUILD_URL=$BUILD_URL"
) > $WORKSPACE/opnfv.properties
+source $WORKSPACE/opnfv.properties
# upload artifacts
gsutil cp -r $WORKSPACE/build_output/* $GS_UPLOAD_LOCATION > $WORKSPACE/gsutil.log 2>&1
@@ -45,11 +46,11 @@ gsutil -m setmeta -r \
# upload metadata file for the artifacts built by daily job
if [[ "$JOB_TYPE" == "daily" ]]; then
gsutil cp $WORKSPACE/opnfv.properties $GS_UPLOAD_LOCATION/opnfv.properties > $WORKSPACE/gsutil.log 2>&1
- gsutil cp $WORKSPACE/opnfv.properties $GS_URL/latest.properties > $WORKSPACE/gsutil.log 2>&1
+ gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/latest.properties > $WORKSPACE/gsutil.log 2>&1
gsutil -m setmeta -r \
-h "Cache-Control:private, max-age=0, no-transform" \
- $GS_UPLOAD_LOCATION/opnfv-${OPNFV_ARTIFACT_VERSION}.properties \
- $GS_URL/latest.properties > /dev/null 2>&1
+ $GS_UPLOAD_LOCATION/opnfv.properties \
+ gs://$GS_URL/latest.properties > /dev/null 2>&1
fi
gsutil ls $GS_UPLOAD_LOCATION > /dev/null 2>&1