summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-06-14 23:02:17 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-06-15 08:49:30 +0000
commit3f0f49c15802a4e1ebb5f18d629e85368092a664 (patch)
treede75e8174e72b3f0651716dea06b94fe0c142fa1
parent72de1829c79a377e0ae1d69f0ebf6af495c06b08 (diff)
ovsnfv: Disable brahmaputra builds and tie builds to slave label
Change-Id: I33cc3ddd5971231fd6d188a8c6d8c48a5885e31b Signed-off-by: Fatih Degirmenci <fatih.degirmenci@ericsson.com>
-rw-r--r--jjb/opnfv/slave-params.yml57
-rw-r--r--jjb/ovsnfv/ovsnfv.yml10
2 files changed, 17 insertions, 50 deletions
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index ee749141f..7b0ab23d2 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -401,7 +401,6 @@
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
description: 'Git URL to use on this Jenkins Slave'
-
- parameter:
name: 'opnfv-build-defaults'
parameters:
@@ -417,52 +416,6 @@
name: BUILD_DIRECTORY
default: $WORKSPACE/build_output
description: "Directory where the build artifact will be located upon the completion of the build."
-
-- parameter:
- name: 'intel-build1-defaults'
- parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - intel-build1
- default-slaves:
- - intel-build1
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
- name: 'intel-build2-defaults'
- parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - intel-build2
- default-slaves:
- - intel-build2
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
-
-- parameter:
- name: 'intel-build3-defaults'
- parameters:
- - node:
- name: SLAVE_NAME
- description: 'Slave name on Jenkins'
- allowed-slaves:
- - intel-build3
- default-slaves:
- - intel-build3
- - string:
- name: GIT_BASE
- default: https://gerrit.opnfv.org/gerrit/$PROJECT
- description: 'Git URL to use on this Jenkins Slave'
-
- parameter:
name: 'zte-pod1-defaults'
parameters:
@@ -683,3 +636,13 @@
name: LAB_CONFIG_URL
default: ssh://git@git.enea.com/pharos/lab-config
description: 'Base URI to the configuration directory'
+- parameter:
+ name: 'opnfv-build-centos-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'opnfv-build-centos'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml
index dbe0a25fa..f002dfae0 100644
--- a/jjb/ovsnfv/ovsnfv.yml
+++ b/jjb/ovsnfv/ovsnfv.yml
@@ -12,9 +12,11 @@
- master:
branch: '{stream}'
gs-pathname: ''
+ disabled: false
- brahmaputra:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
+ disabled: true
- job-template:
name: 'ovsnfv-verify-{stream}'
@@ -24,7 +26,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'intel-build2-defaults'
+ - 'opnfv-build-centos-defaults'
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'
@@ -71,7 +73,7 @@
project: '{project}'
- gerrit-parameter:
branch: '{branch}'
- - 'intel-build2-defaults'
+ - 'opnfv-build-centos-defaults'
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'
@@ -112,10 +114,12 @@
- job-template:
name: 'ovsnfv-daily-{stream}'
+ disabled: '{disabled}'
+
parameters:
- project-parameter:
project: '{project}'
- - 'intel-build2-defaults'
+ - 'opnfv-build-centos-defaults'
- string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'