diff options
| author |   Fatih Degirmenci <fatih.degirmenci@ericsson.com> | 2016-06-15 11:33:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-15 11:33:22 +0000 |
| commit | d016482597c74c18c58f7efcd17bf3f497b2a2d6 (patch) | |
| tree | 195c74c42424db6ac30f01c6e913797c7959ad68 /jjb/opnfv/slave-params.yml | |
| parent | d01e5b704f18df26c91ba35a5c8cac63502af204 (diff) | |
| parent | c57575942f38709573bae137a5ad2b62d8e175a1 (diff) | |
Merge "Tie all verify/merge/build to opnfv-build-ubuntu"
Diffstat (limited to 'jjb/opnfv/slave-params.yml')
| -rw-r--r-- | jjb/opnfv/slave-params.yml | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml index 7b0ab23d2..da0808b76 100644 --- a/jjb/opnfv/slave-params.yml +++ b/jjb/opnfv/slave-params.yml @@ -402,21 +402,6 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' - parameter: - name: 'opnfv-build-defaults' - parameters: - - label: - name: SLAVE_LABEL - default: 'opnfv-build' - description: 'Slave label on Jenkins' - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/$PROJECT - description: 'Git URL to use on this Jenkins Slave' - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." -- parameter: name: 'zte-pod1-defaults' parameters: - node: @@ -646,3 +631,22 @@ name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." +- parameter: + name: 'opnfv-build-ubuntu-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'opnfv-build-ubuntu' + description: 'Slave label on Jenkins' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - string: + name: BUILD_DIRECTORY + default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." |