Merge "Enable daisy euphrates jobs of daily and functest"

[releng.git] / jjb / functest / functest-daily-jobs.yml

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 3a22a1d..04a2936 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -122,6 +122,14 @@
             slave-label: daisy-virtual
             installer: daisy
             <<: *master
+        - baremetal:
+            slave-label: daisy-baremetal
+            installer: daisy
+            <<: *euphrates
+        - virtual:
+            slave-label: daisy-virtual
+            installer: daisy
+            <<: *euphrates
 # netvirt 3rd party ci
         - virtual:
             slave-label: odl-netvirt-virtual
@@ -160,15 +168,19 @@
             <<: *euphrates
         - zte-pod2:
             slave-label: '{pod}'
-            installer: fuel
+            installer: daisy
             <<: *master
+        - zte-pod2:
+            slave-label: '{pod}'
+            installer: daisy
+            <<: *euphrates
         - zte-pod3:
             slave-label: '{pod}'
-            installer: fuel
+            installer: daisy
             <<: *master
         - zte-pod3:
             slave-label: '{pod}'
-            installer: fuel
+            installer: daisy
             <<: *euphrates
 # PODs for verify jobs triggered by each patch upload
 #        - ool-virtual1:
@@ -216,7 +228,7 @@
 
     wrappers:
         - build-name:
-            name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+            name: '$BUILD_NUMBER Suite: $FUNCTEST_MODE Scenario: $DEPLOY_SCENARIO'
         - timeout:
             timeout: '{job-timeout}'
             abort: true