summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-08-17 10:37:21 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-17 10:37:21 +0000
commit4a416669bb2b63729223e84b9d0d8723c05c42ee (patch)
treef043101bc1ff2944a94e5241bb5afa93614f2e73 /jjb
parentf1cc83e3526dd0d30ac455b71d1d1a47e66d4318 (diff)
parentdbd930a09d2d4ec73d92313fa6cccc1e69c09282 (diff)
Merge "kvmfornfv: Remove artifacts created for the previous patch of the same change"
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/kvmfornfv/kvmfornfv-download-artifact.sh3
-rwxr-xr-xjjb/kvmfornfv/kvmfornfv-upload-artifact.sh7
2 files changed, 9 insertions, 1 deletions
diff --git a/jjb/kvmfornfv/kvmfornfv-download-artifact.sh b/jjb/kvmfornfv/kvmfornfv-download-artifact.sh
index 89b7e3164..1f99f177b 100755
--- a/jjb/kvmfornfv/kvmfornfv-download-artifact.sh
+++ b/jjb/kvmfornfv/kvmfornfv-download-artifact.sh
@@ -1,4 +1,7 @@
#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then
JOB_TYPE=${BASH_REMATCH[0]}
diff --git a/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh b/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh
index 190ab4b4d..48c013498 100755
--- a/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh
+++ b/jjb/kvmfornfv/kvmfornfv-upload-artifact.sh
@@ -1,4 +1,7 @@
#!/bin/bash
+set -o errexit
+set -o nounset
+set -o pipefail
if [[ "$JOB_NAME" =~ (verify|merge|daily|weekly) ]]; then
JOB_TYPE=${BASH_REMATCH[0]}
@@ -11,6 +14,8 @@ case "$JOB_TYPE" in
verify)
echo "Uploading artifacts for the change $GERRIT_CHANGE_NUMBER. This could take some time..."
GS_UPLOAD_LOCATION="gs://artifacts.opnfv.org/$PROJECT/review/$GERRIT_CHANGE_NUMBER"
+ echo "Removing artifacts produced for the previous patch for the change $GERRIT_CHANGE_NUMBER"
+ gsutil rm -r $GS_UPLOAD_LOCATION
;;
daily)
echo "Uploding daily artifacts This could take some time..."
@@ -22,7 +27,7 @@ case "$JOB_TYPE" in
exit 1
esac
-gsutil cp -r $WORKSPACE/build_output $GS_UPLOAD_LOCATION > $WORKSPACE/gsutil.log 2>&1
+gsutil cp -r $WORKSPACE/build_output/* $GS_UPLOAD_LOCATION > $WORKSPACE/gsutil.log 2>&1
gsutil -m setmeta -r \
-h "Cache-Control:private, max-age=0, no-transform" \
$GS_UPLOAD_LOCATION > /dev/null 2>&1