summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-05-29 08:14:21 -0400
committerTim Rozet <trozet@redhat.com>2016-05-29 08:29:28 -0400
commit9a4aee1b758d5b518b20e90aee4fe75eb01aa774 (patch)
tree0b89361c2e3d84c94c442bdea8eec67bec474133
parentcc684c41e9314d6a587fe4e7170715ff0e8c76e1 (diff)
Apex, Functest: Reconfigure Apex with labels
Change-Id: Ia56ceefe5bf93cf15f89133c40f0e23c678e11d3 Signed-off-by: Tim Rozet <trozet@redhat.com>
-rw-r--r--jjb/apex/apex.yml4
-rw-r--r--jjb/functest/functest-ci-jobs.yml13
-rw-r--r--jjb/opnfv/slave-params.yml36
3 files changed, 42 insertions, 11 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index bad84f46e..cd4441796 100644
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -652,7 +652,7 @@
same-node: true
block: true
- trigger-builds:
- - project: 'functest-apex-{slave}-daily-{stream1}'
+ - project: 'functest-apex-{daily-slave}-daily-{stream1}'
predefined-parameters:
DEPLOY_SCENARIO=os-nosdn-nofeature-ha
block: true
@@ -680,7 +680,7 @@
same-node: true
block: true
- trigger-builds:
- - project: 'functest-apex-{slave}-daily-{stream1}'
+ - project: 'functest-apex-{daily-slave}-daily-{stream1}'
predefined-parameters:
DEPLOY_SCENARIO=os-odl_l2-nofeature-ha
block: true
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index d7e37292a..5ac2d0dc1 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -86,20 +86,15 @@
slave-label: compass-virtual
installer: compass
<<: *brahmaputra
-#--------------------------------
-# Installers not using labels
-# CI PODs
-# This section should only contain the installers
-# that have not been switched using labels for slaves
-#--------------------------------
- - intel-pod7:
+# apex CI PODs
+ - apex-verify-master:
slave-label: '{pod}'
installer: apex
<<: *master
- - lf-pod1:
+ - apex-daily-master:
slave-label: '{pod}'
installer: apex
- <<: *brahmaputra
+ <<: *master
#--------------------------------
# None-CI PODs
#--------------------------------
diff --git a/jjb/opnfv/slave-params.yml b/jjb/opnfv/slave-params.yml
index 02d74abff..3dc9be132 100644
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -1,4 +1,40 @@
- parameter:
+ name: 'apex-daily-master-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'apex-daily-master'
+ - string:
+ name: INSTALLER_VERSION
+ default: latest
+ description: 'Version of the installer to deploy'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
+ name: SSH_KEY
+ default: /root/.ssh/id_rsa
+ description: 'SSH key to use for Apex'
+- parameter:
+ name: 'apex-verify-master-defaults'
+ parameters:
+ - label:
+ name: SLAVE_LABEL
+ default: 'apex-verify-master'
+ - string:
+ name: INSTALLER_VERSION
+ default: latest
+ description: 'Version of the installer to deploy'
+ - string:
+ name: GIT_BASE
+ default: https://gerrit.opnfv.org/gerrit/$PROJECT
+ description: 'Git URL to use on this Jenkins Slave'
+ - string:
+ name: SSH_KEY
+ default: /root/.ssh/id_rsa
+ description: 'SSH key to use for Apex'
+- parameter:
name: 'fuel-baremetal-defaults'
parameters:
- label: