diff options
| -rw-r--r-- | jjb/ovsnfv/ovsnfv.yml | 16 | ||||
| -rw-r--r-- | jjb/releng-macros.yaml | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index c01d7ae18..f29219c97 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -11,11 +11,11 @@ # only master branch is enabled at the moment to keep no of jobs sane stream: - master: - branch: 'master' + branch: '{stream}' gs-pathname: '' # - brahmaputra: # branch: 'stable/brahmaputra' -# gs-pathname: '/brahmaputra' +# gs-pathname: '/{stream}' - job-template: name: 'ovsnfv-verify-{stream}' @@ -26,6 +26,10 @@ - gerrit-parameter: branch: '{branch}' - 'intel-us-build-2-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: - gerrit-trigger-scm: @@ -71,6 +75,10 @@ - gerrit-parameter: branch: '{branch}' - 'intel-us-build-2-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: - gerrit-trigger-scm: @@ -110,8 +118,8 @@ - 'intel-us-build-2-defaults' - string: name: GS_URL - default: gs://$GS_BASE{gs-pathname} - description: "URL to Google Storage." + default: '$GS_BASE{gs-pathname}' + description: "Directory where the build artifact will be located upon the completion of the build." scm: - git-scm: diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index b94fd8fa2..8d6f55193 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: |