diff options
Diffstat (limited to 'jjb/opnfv')
| -rw-r--r-- | jjb/opnfv/opnfv-docs.yml | 8 | ||||
| -rw-r--r-- | jjb/opnfv/pod-params.yml | 17 |
2 files changed, 21 insertions, 4 deletions
diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml index 841ce2e3d..6c6b91532 100644 --- a/jjb/opnfv/opnfv-docs.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -8,8 +8,8 @@ project: opnfv-docs jobs: - - 'opnfv-docs-verify' - - 'opnfv-docs-merge' + - 'opnfv-docs-verify-{stream}' + - 'opnfv-docs-merge-{stream}' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) @@ -22,7 +22,7 @@ ######################## - job-template: - name: 'opnfv-docs-verify' + name: 'opnfv-docs-verify-{stream}' parameters: - project-parameter: @@ -63,7 +63,7 @@ - upload-review-docs - job-template: - name: 'opnfv-docs-merge' + name: 'opnfv-docs-merge-{stream}' parameters: - project-parameter: diff --git a/jjb/opnfv/pod-params.yml b/jjb/opnfv/pod-params.yml index 3fdf01356..6a2650667 100644 --- a/jjb/opnfv/pod-params.yml +++ b/jjb/opnfv/pod-params.yml @@ -190,6 +190,23 @@ description: 'Git URL to use on the jumphost' - parameter: + name: 'opnfv-build-defaults' + parameters: + - node: + name: SLAVE_NAME + description: 'Slave name on Jenkins' + allowed-slaves: + - intel-us-build-1 + - ericsson-ca-build-1 + default-slaves: + - intel-us-build-1 + - ericsson-ca-build-1 + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on the slave' + +- parameter: name: 'intel-us-build-1-defaults' parameters: - node: |