Apex, Functest: Reconfigure Apex with labels

Change-Id: Ia56ceefe5bf93cf15f89133c40f0e23c678e11d3
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index bad84f4..cd44417 100644 (file)
--- 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 d7e3729..5ac2d0d 100644 (file)
--- 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 02d74ab..3dc9be1 100644 (file)
--- a/jjb/opnfv/slave-params.yml
+++ b/jjb/opnfv/slave-params.yml
@@ -1,3 +1,39 @@
+- 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: