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/releng-macros.yaml | |
| 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/releng-macros.yaml')
| -rw-r--r-- | jjb/releng-macros.yaml | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index b94fd8fa2..787b7bacc 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -9,11 +9,11 @@ description: "JJB configured PROJECT parameter to identify an opnfv Gerrit project" - string: name: GS_BASE - default: artifacts.opnfv.org/$PROJECT/ + default: artifacts.opnfv.org/$PROJECT description: "URL to Google Storage." - string: name: GS_BASE_PROXY - default: build.opnfv.org/artifacts/$PROJECT/ + default: build.opnfv.org/artifacts/$PROJECT description: "URL to Google Storage proxy" - parameter: @@ -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 \ |