diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2016-01-05 03:42:01 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-05 03:42:01 +0000 |
| commit | 8fc626e74e066567a17be02e3e593bde16d9bf62 (patch) | |
| tree | 0a6ee90506de72ce895260291242e54188608728 | |
| parent | 95561b6d8fad21199ce009ead9998defda7a6b32 (diff) | |
| parent | e8514c1a8a6f61b7639fca9b78e127d392ced87f (diff) | |
Merge "Enable brahmaputra branch for doc verify and merge jobs"
| -rw-r--r-- | jjb/onosfw/onosfw.yml | 16 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docs.yml | 12 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 9 |
3 files changed, 20 insertions, 17 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: diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index 3574b3988..6edd0b06e 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -11,11 +11,13 @@ - 'opnfv-docs-verify-{stream}' - 'opnfv-docs-merge-{stream}' - # stream: branch with - in place of / (eg. stable-arno) - # branch: branch (eg. stable/arno) stream: - master: - branch: 'master' + branch: '{stream}' + gs-pathname: '' + - brahmaputra: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' ######################## # job templates @@ -70,6 +72,10 @@ project: $GERRIT_PROJECT - gerrit-parameter: branch: 'master' + - 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: - gerrit-trigger-scm: diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 8d6f55193..787b7bacc 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -216,17 +216,12 @@ echo "#####################" echo - if [[ "$GERRIT_BRANCH" == "master" ]] ; then - gs_base="artifacts.opnfv.org/$GERRIT_PROJECT" - else - gs_base="artifacts.opnfv.org/$GERRIT_PROJECT/$GERRIT_BRANCH" - fi - gs_path="$gs_base/docs" + gs_path="$GS_URL/docs" local_path="upload/docs" mkdir -p upload mv output "$local_path" - gsutil -m cp -r "$local_path" "gs://$gs_base" + gsutil -m cp -r "$local_path" "gs://$GS_URL" if gsutil ls "gs://$gs_path" | grep -e 'html$' > /dev/null 2>&1 ; then gsutil -m setmeta \ |