Apex,Functest: Create correct danube functest jobs for Apex

Also adds odl_l3-fdio-noha to daily job for Apex

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 9ce8331..5cc596e 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -26,8 +26,8 @@
             branch: 'stable/danube'
             gs-pathname: '/danube'
             slave: 'lf-pod1'
-            verify-slave: 'apex-verify-master'
-            daily-slave: 'apex-daily-master'
+            verify-slave: 'apex-verify-danube'
+            daily-slave: 'apex-daily-danube'
 
     project: 'apex'
 
@@ -801,6 +801,36 @@
                 build-step-failure-threshold: 'never'
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'apex-deploy-baremetal-os-odl_l3-fdio-noha-{stream}'
+            predefined-parameters: |
+              BUILD_DIRECTORY=apex-build-{stream}/.build
+              OPNFV_CLEAN=yes
+            git-revision: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+            block: true
+        - trigger-builds:
+          - project: 'functest-apex-{daily-slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l3-fdio-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-apex-{slave}-daily-{stream}'
+            predefined-parameters:
+              DEPLOY_SCENARIO=os-odl_l3-fdio-noha
+            block: true
+            same-node: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 # CSIT promote
 - job-template:

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 5984b36..972c4fd 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -88,14 +88,14 @@
             slave-label: '{pod}'
             installer: apex
             <<: *master
-#        - apex-verify-danube:
-#            slave-label: '{pod}'
-#            installer: apex
-#            <<: *danube
-#        - apex-daily-danube:
-#            slave-label: '{pod}'
-#            installer: apex
-#            <<: *danube
+        - apex-verify-danube:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *danube
+        - apex-daily-danube:
+            slave-label: '{pod}'
+            installer: apex
+            <<: *danube
 # armband CI PODs
         - armband-baremetal:
             slave-label: armband-baremetal

diff --git a/jjb/global/slave-params.yml b/jjb/global/slave-params.yml
index 4b3eaaa..6aa2e71 100644 (file)
--- a/jjb/global/slave-params.yml
+++ b/jjb/global/slave-params.yml
@@ -25,11 +25,11 @@
             default-slaves:
                 - lf-pod1
 - parameter:
-    name: 'apex-daily-colorado-defaults'
+    name: 'apex-daily-danube-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'apex-daily-colorado'
+            default: 'apex-daily-danube'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@ -71,11 +71,11 @@
                 - intel-virtual4
                 - intel-virtual5
 - parameter:
-    name: 'apex-verify-colorado-defaults'
+    name: 'apex-verify-danube-defaults'
     parameters:
         - label:
             name: SLAVE_LABEL
-            default: 'apex-verify-colorado'
+            default: 'apex-verify-danube'
         - string:
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT