summaryrefslogtreecommitdiffstats
path: root/jjb/opnfv
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-06-15 13:18:09 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-06-15 13:18:09 +0200
commitc57575942f38709573bae137a5ad2b62d8e175a1 (patch)
tree040778aba85a957d871d79348e6f995554ad9a66 /jjb/opnfv
parent3f0f49c15802a4e1ebb5f18d629e85368092a664 (diff)
Tie all verify/merge/build to opnfv-build-ubuntu
We reconfigured centos build server now and it is important to know which jobs require centos and which ones ubuntu. The machines with ubuntu were labelled with opnfv-build previously, preventing us from keeping track of which projects require what OS. This tries to solve that. Change-Id: I1fb2912ec49f5bc2781853e500508d9992d59fbb Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
Diffstat (limited to 'jjb/opnfv')
-rw-r--r--jjb/opnfv/slave-params.yml34
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."