diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-04 11:23:18 +0100 |
|---|---|---|
| committer | Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-01-04 14:31:12 +0000 |
| commit | e8514c1a8a6f61b7639fca9b78e127d392ced87f (patch) | |
| tree | 254b9a27222fa6bc1e006f33c266d58fd92a076e /jjb/onosfw | |
| parent | a68a8dd1a2f80ad413c6711a12bcd1dd40345eac (diff) | |
Enable brahmaputra branch for doc verify and merge jobs
This change also adjusts GS_BASE parameter in releng-macros.yml
and uses GS_BASE in docs-merge job. ONOS builders are also adjusted.
Change-Id: Ic9f28a3a7e283cba6736e96f8f7e18c859099e6c
Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/onosfw')
| -rw-r--r-- | jjb/onosfw/onosfw.yml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml index df1fdb7f3..7dc0241f9 100644 --- a/jjb/onosfw/onosfw.yml +++ b/jjb/onosfw/onosfw.yml @@ -92,6 +92,10 @@ - project-parameter: project: '{project}' - 'opnfv-build-defaults' + - string: + name: GS_URL + default: '$GS_BASE{gs-pathname}' + description: "Directory where the build artifact will be located upon the completion of the build." scm: - git-scm: @@ -102,8 +106,6 @@ builders: - 'builder-onosfw-helloworld' - - ######################## # builder macros ######################## @@ -140,7 +142,7 @@ 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_BASE/opnfv-$OPNFV_ARTIFACT_VERSION.iso" + echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/onosfw.iso | cut -d' ' -f1)" echo "OPNFV_BUILD_URL=$BUILD_URL" ) > $BUILD_DIRECTORY/opnfv.properties @@ -167,14 +169,14 @@ source $BUILD_DIRECTORY/opnfv.properties # upload artifact and additional files to google storage - gsutil cp $BUILD_DIRECTORY/onosfw.iso gs://$GS_BASE/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 - gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_BASE/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 - gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_BASE/latest.properties > gsutil.latest.log 2>&1 + gsutil cp $BUILD_DIRECTORY/onosfw.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 + gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 + gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 echo echo "--------------------------------------------------------" echo "Done!" - echo "Artifact is available as http://$GS_BASE/opnfv-$OPNFV_ARTIFACT_VERSION.iso" + echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" - builder: |