Merge "Enable daisy euphrates jobs of daily and functest"

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index a9249ea..7b75383 100644 (file)
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -37,6 +37,12 @@
         - virtual:
             slave-label: daisy-virtual
             <<: *master
+        - baremetal:
+            slave-label: daisy-baremetal
+            <<: *euphrates
+        - virtual:
+            slave-label: daisy-virtual
+            <<: *euphrates
 #--------------------------------
 #        None-CI PODs
 #--------------------------------
@@ -225,6 +231,11 @@
     name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger'
     triggers:
         - timed: '0 0 * * *'
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-euphrates-trigger'
+    triggers:
+        - timed: ''
 # ODL Scenarios
 - trigger:
     name: 'daisy-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger'
@@ -238,6 +249,11 @@
     name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger'
     triggers:
         - timed: '0 0 * * *'
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger'
+    triggers:
+        - timed: ''
 # ODL Scenarios
 - trigger:
     name: 'daisy-os-odl-nofeature-ha-virtual-daily-euphrates-trigger'

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 443c639..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: