[daisy] Run fraser jobs on zte-pod3

[releng.git] / jjb / daisy4nfv / daisy-daily-jobs.yml

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 0f2d917..ac17281 100644 (file)
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -48,9 +48,12 @@
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
-      # - baremetal:
-      #     slave-label: zte-pod3
-      #     <<: *master
+      - zte-pod3:
+          slave-label: zte-pod3
+          <<: *master
+      - zte-pod3:
+          slave-label: zte-pod3
+          <<: *fraser
       - zte-pod9:
           slave-label: zte-pod9
           <<: *master
@@ -156,9 +159,6 @@
             - condition-kind: regex-match
               regex: 'baremetal'
               label: '{pod}'
-            - condition-kind: regex-match
-              regex: 'master'
-              label: '{stream}'
           steps:
             - trigger-builds:
                 - project: 'yardstick-daisy-{pod}-daily-{stream}'
@@ -194,8 +194,8 @@
           blocking-jobs:
             - 'daisy-kolla-build-.*'
             - '{installer}-(build|deploy|test)-daily-(fraser|master)'
-            - '{installer}-deploy-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
-            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(fraser|master)'
+            - '{installer}-deploy-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
+            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod3|zte-pod9)-daily-(fraser|master)'
           block-level: 'NODE'
 
     parameters:
@@ -242,7 +242,7 @@
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: ''
 # Basic NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
@@ -252,7 +252,7 @@
 - trigger:
     name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-      - timed: '0 18 * * *'
+      - timed: ''
 # ovs_dpdk Scenarios
 - trigger:
     name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-master-trigger'
@@ -290,7 +290,7 @@
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
     triggers:
-      - timed: '0 0 * * *'
+      - timed: '0 0,6 * * *'
 # Basic NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
@@ -300,7 +300,7 @@
 - trigger:
     name: 'daisy-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: '0 12,18 * * *'
 # ovs_dpdk Scenarios
 - trigger:
     name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger'
@@ -331,6 +331,54 @@
     triggers:
       - timed: ''
 
+# ----------------------------------------------
+# Triggers for job running on zte-pod3 against master branch
+# ----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-master-trigger'
+    triggers:
+      - timed: ''
+
+# ----------------------------------------------
+# Triggers for job running on zte-pod3 against fraser branch
+# ----------------------------------------------
+# Basic HA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-ha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: '0 16,22 * * *'
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod3-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+
 # ----------------------------------------------
 # ZTE POD9 Triggers running against master branch
 # ----------------------------------------------