X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fdaisy4nfv%2Fdaisy-daily-jobs.yml;h=2eb27a6633b0094fdef8e6ccac99d287d6d80f70;hb=f239cf753a2bc2c681b947c3be865fc96875f6b0;hp=b3c37b88f2b24a0dbdabe54de5d6aee44ac234bd;hpb=02ea0678f840da4f63821c2753079263c6fcde11;p=releng.git

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index b3c37b88f..2eb27a663 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,31 +29,34 @@
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
-    #        CI PODs
-    # -------------------------------
     pod:
-      # - baremetal:
-      #     slave-label: daisy-baremetal
-      #     <<: *master
+      # -------------------------------
+      #        CI PODs
+      # -------------------------------
+      - baremetal:
+          slave-label: daisy-baremetal
+          <<: *master
       - virtual:
           slave-label: daisy-virtual
           <<: *master
       - baremetal:
           slave-label: daisy-baremetal
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: daisy-virtual
-          <<: *euphrates
+          <<: *fraser
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
-      - baremetal:
-          slave-label: zte-pod3
+      # - baremetal:
+      #     slave-label: zte-pod3
+      #     <<: *master
+      - zte-pod9:
+          slave-label: zte-pod9
           <<: *master
-
-    # -------------------------------
-    #        None-CI PODs
-    # -------------------------------
+      - zte-pod9:
+          slave-label: zte-pod9
+          <<: *fraser
 
     # -------------------------------
     #       scenarios
@@ -68,6 +71,9 @@
       # ODL_L3 scenarios
       - 'os-odl-nofeature-ha':
           auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
+      # ovs_dpdk scenarios
+      - 'os-nosdn-ovs_dpdk-noha':
+          auto-trigger-name: 'daisy-{scenario}-{pod}-daily-{stream}-trigger'
 
     jobs:
       - '{project}-{scenario}-{pod}-daily-{stream}'
@@ -93,7 +99,9 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'daisy-os-.*?-{pod}-daily-.*?'
             - 'daisy-daily-.*'
+            - 'daisy-kolla-build-.*'
           block-level: 'NODE'
 
     wrappers:
@@ -110,9 +118,7 @@
       - '{installer}-defaults'
       - '{slave-label}-defaults':
           installer: '{installer}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
+      - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
 
@@ -122,21 +128,51 @@
       - trigger-builds:
           - project: 'daisy-deploy-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
+            predefined-parameters: |
               DEPLOY_SCENARIO={scenario}
+              INSTALLER_VERSION={stream}
+              UPSTREAM_JOB_NAME=$JOB_NAME
+              UPSTREAM_BUILD_ID=$BUILD_ID
             same-node: true
             block: true
       - trigger-builds:
           - project: 'functest-daisy-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
+            predefined-parameters: |
               DEPLOY_SCENARIO={scenario}
+              INSTALLER_VERSION={stream}
+              UPSTREAM_JOB_NAME=$JOB_NAME
+              UPSTREAM_BUILD_ID=$BUILD_ID
             same-node: true
             block: true
             block-thresholds:
               build-step-failure-threshold: 'never'
               failure-threshold: 'never'
               unstable-threshold: 'FAILURE'
+      - conditional-step:
+          condition-kind: and
+          condition-operands:
+            - 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}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    DEPLOY_SCENARIO={scenario}
+                    INSTALLER_VERSION={stream}
+                    UPSTREAM_JOB_NAME=$JOB_NAME
+                    UPSTREAM_BUILD_ID=$BUILD_ID
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
 
 - job-template:
     name: '{project}-deploy-{pod}-daily-{stream}'
@@ -155,7 +191,10 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'daisy.*-deploy-({pod})?-daily-.*'
+            - '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)'
           block-level: 'NODE'
 
     parameters:
@@ -165,9 +204,7 @@
       - '{installer}-defaults'
       - '{slave-label}-defaults':
           installer: '{installer}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
+      - 'testapi-parameter'
       - 'daisy-project-parameter':
           gs-pathname: '{gs-pathname}'
       - string:
@@ -185,10 +222,13 @@
     builders:
       - description-setter:
           description: "POD: $NODE_NAME"
+      - 'track-begin-timestamp'
       - shell:
           !include-raw-escape: ./daisy4nfv-download-artifact.sh
       - shell:
           !include-raw-escape: ./daisy-deploy.sh
+    publishers:
+      - 'report-provision-result'
 
 ########################
 # trigger macros
@@ -200,7 +240,7 @@
 - trigger:
     name: 'daisy-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-      - timed: '0 16 * * *'
+      - timed: '0 12 * * *'
 # Basic NOHA Scenarios
 - trigger:
     name: 'daisy-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
@@ -210,7 +250,12 @@
 - trigger:
     name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-      - timed: '0 12 * * *'
+      - timed: '0 18 * * *'
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-master-trigger'
+    triggers:
+      - timed: ''
 
 # ----------------------------------------------
 # Triggers for job running on daisy-virtual against master branch
@@ -230,41 +275,104 @@
     name: 'daisy-os-odl-nofeature-ha-virtual-daily-master-trigger'
     triggers:
       - timed: '0 12 * * *'
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-master-trigger'
+    triggers:
+      - 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 * * *'
 # 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 * * *'
+# ovs_dpdk Scenarios
+- 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-fraser-trigger'
+    triggers:
+      - timed: ''
+
+# ----------------------------------------------
+# ZTE POD9 Triggers running against master branch
+# ----------------------------------------------
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-zte-pod9-daily-master-trigger'
+    triggers:
+      - timed: '0 20 * * *'
+# Basic HA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-ha-zte-pod9-daily-master-trigger'
+    triggers:
+      - timed: ''
+# Basic NOHA Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-nofeature-noha-zte-pod9-daily-master-trigger'
+    triggers:
+      - timed: ''
+# ODL Scenarios
+- trigger:
+    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: ''