X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy-daily-jobs.yml;h=ac172813df491ad67f44cba28a05733ffa54782d;hb=6cd969c1abf6ef04a21430c2acaadbd969838d3e;hp=453451f52d5a01298f4a2eda7a3575d5ed9cf9d1;hpb=b87f1d4130984073ed11989f06c7ccf6a28985d5;p=releng.git

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 453451f52..ac172813d 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -20,8 +20,8 @@
       branch: '{stream}'
       disabled: false
       gs-pathname: ''
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
       disabled: false
@@ -29,33 +29,37 @@
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
-    #        CI PODs
-    # -------------------------------
     pod:
+      # -------------------------------
+      #        CI PODs
+      # -------------------------------
       - baremetal:
           slave-label: daisy-baremetal
           <<: *master
       - virtual:
           slave-label: daisy-virtual
           <<: *master
-      # - baremetal:
-      #     slave-label: daisy-baremetal
-      #     <<: *euphrates
-      # - virtual:
-      #     slave-label: daisy-virtual
-      #     <<: *euphrates
+      - baremetal:
+          slave-label: daisy-baremetal
+          <<: *fraser
+      - virtual:
+          slave-label: daisy-virtual
+          <<: *fraser
       # -------------------------------
       #        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
-    # -------------------------------
-    #        None-CI PODs
-    # -------------------------------
+      - zte-pod9:
+          slave-label: zte-pod9
+          <<: *fraser
 
     # -------------------------------
     #       scenarios
@@ -120,6 +124,7 @@
       - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
+      - 'deploy-scenario'
 
     builders:
       - description-setter:
@@ -154,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}'
@@ -191,9 +193,9 @@
           use-build-blocker: true
           blocking-jobs:
             - 'daisy-kolla-build-.*'
-            - '{installer}-daily-(build|deploy|test)-(euphrates|master)'
-            - '{installer}-.*-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
-            - '(functest|yardstick)-{installer}-(baremetal|virtual|zte-pod9)-daily-(euphrates|master)'
+            - '{installer}-(build|deploy|test)-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:
@@ -206,6 +208,7 @@
       - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
+      - 'deploy-scenario'
       - string:
           name: DEPLOY_TIMEOUT
           default: '150'
@@ -239,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'
@@ -249,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'
@@ -281,50 +284,98 @@
       - timed: ''
 
 # ----------------------------------------------
-# Triggers for job running on daisy-baremetal against euphrates branch
+# Triggers for job running on daisy-baremetal against fraser branch
 # ----------------------------------------------
 # Basic HA Scenarios
 - trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-euphrates-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-euphrates-trigger'
+    name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 # ODL Scenarios
 - trigger:
-    name: 'daisy-os-odl-nofeature-ha-baremetal-daily-euphrates-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-euphrates-trigger'
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-fraser-trigger'
     triggers:
       - timed: ''
 
 # ----------------------------------------------
-# Triggers for job running on daisy-virtual against euphrates branch
+# Triggers for job running on daisy-virtual against fraser branch
 # ----------------------------------------------
 # Basic HA Scenarios
 - trigger:
-    name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-euphrates-trigger'
+    name: 'daisy-os-nosdn-nofeature-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: '0 0 * * *'
 # Basic NOHA Scenarios
 - trigger:
-    name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger'
+    name: 'daisy-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger'
     triggers:
       - timed: ''
 # ODL Scenarios
 - trigger:
-    name: 'daisy-os-odl-nofeature-ha-virtual-daily-euphrates-trigger'
+    name: 'daisy-os-odl-nofeature-ha-virtual-daily-fraser-trigger'
     triggers:
       - timed: '0 20 * * *'
 # ovs_dpdk Scenarios
 - trigger:
-    name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-euphrates-trigger'
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-fraser-trigger'
+    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: ''
 
@@ -335,7 +386,7 @@
 - trigger:
     name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-master-trigger'
     triggers:
-      - timed: '0 10,20 * * *'
+      - timed: '0 20 * * *'
 # Basic HA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-master-trigger'
@@ -351,3 +402,27 @@
     name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-master-trigger'
     triggers:
       - timed: ''
+
+# ----------------------------------------------
+# ZTE POD9 Triggers running against fraser branch
+# ----------------------------------------------
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-fraser-trigger'
+    triggers:
+      - timed: '0 10 * * *'
+# Basic HA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-zte-pod9-daily-fraser-trigger'
+    triggers:
+      - timed: ''
+# ODL Scenarios
+- trigger:
+    name: 'daisy-os-odl-nofeature-ha-zte-pod9-daily-fraser-trigger'
+    triggers:
+      - timed: ''