diff options
| author |   Serena Feng <feng.xiaowei@zte.com.cn> | 2017-10-11 07:39:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-11 07:39:38 +0000 |
| commit | 2ec02b9acd6bcdf251ef5ae1cb8a4a304aed1195 (patch) | |
| tree | 8520f354a1ded7e2cf464a0e2aee588c4a6447c0 /jjb | |
| parent | f6255c45367f39533b589a91ca351ad0bcfd0ac9 (diff) | |
| parent | 3f60ba24a4050e3c3a7de8280270e3efa5b52cef (diff) | |
Merge "jjb: daisy: Upload iso file as well as the bin file"
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/daisy4nfv/daisy4nfv-build.sh | 2 | ||||
| -rwxr-xr-x | jjb/daisy4nfv/daisy4nfv-upload-artifact.sh | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/jjb/daisy4nfv/daisy4nfv-build.sh b/jjb/daisy4nfv/daisy4nfv-build.sh index 925f68e18..a081b3bc6 100755 --- a/jjb/daisy4nfv/daisy4nfv-build.sh +++ b/jjb/daisy4nfv/daisy4nfv-build.sh @@ -31,6 +31,8 @@ cd $WORKSPACE echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)" echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin" echo "OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $OUTPUT_DIR/opnfv-$OPNFV_ARTIFACT_VERSION.bin | cut -d' ' -f1)" + echo "OPNFV_ARTIFACT_URL_ISO=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" + echo "OPNFV_ARTIFACT_SHA512SUM_ISO=$(sha512sum $OUTPUT_DIR/opnfv-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)" echo "OPNFV_BUILD_URL=$BUILD_URL" ) > $WORKSPACE/opnfv.properties diff --git a/jjb/daisy4nfv/daisy4nfv-upload-artifact.sh b/jjb/daisy4nfv/daisy4nfv-upload-artifact.sh index 6b0aec54f..27bb8de23 100755 --- a/jjb/daisy4nfv/daisy4nfv-upload-artifact.sh +++ b/jjb/daisy4nfv/daisy4nfv-upload-artifact.sh @@ -50,13 +50,15 @@ cd $WORKSPACE # upload artifact and additional files to google storage gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.bin \ gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin > gsutil.bin.log 2>&1 +gsutil cp $BUILD_DIRECTORY/opnfv-$OPNFV_ARTIFACT_VERSION.iso \ + gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.bin >> gsutil.bin.log 2>&1 gsutil cp $WORKSPACE/opnfv.properties \ gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 if [[ ! "$JOB_NAME" =~ (verify|merge) ]]; then gsutil cp $WORKSPACE/opnfv.properties \ gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 elif [[ "$JOB_NAME" =~ "merge" ]]; then - echo "Uploaded Daisy4nfv BIN for a merged change" + echo "Uploaded Daisy4nfv artifacts for a merged change" fi gsutil -m setmeta \ |