X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy-daily-jobs.yml;h=5a0e321f01597d36c027f8a9bf2cb34b401adf23;hb=36b4348e88e2dc2f8a53fa3b9d053aa0bd25abb9;hp=2f091491ccf5834b6a33d0b5e64d9d1192283bb1;hpb=598c2f7deafede33d3d0190632dce4d4ab6de246;p=releng.git

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index 2f091491c..5a0e321f0 100644
--- a/jjb/daisy4nfv/daisy-daily-jobs.yml
+++ b/jjb/daisy4nfv/daisy-daily-jobs.yml
@@ -50,7 +50,9 @@
       - baremetal:
           slave-label: zte-pod3
           <<: *master
-
+      - zte-pod9:
+          slave-label: zte-pod9
+          <<: *master
     # -------------------------------
     #        None-CI PODs
     # -------------------------------
@@ -68,6 +70,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,6 +98,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'daisy-os-.*?-{pod}-daily-.*?'
             - 'daisy-daily-.*'
             - 'daisy-kolla-build-.*'
           block-level: 'NODE'
@@ -125,6 +131,9 @@
             current-parameters: false
             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:
@@ -132,12 +141,39 @@
             current-parameters: false
             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}'
@@ -187,10 +223,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
@@ -202,7 +241,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'
@@ -212,7 +251,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
@@ -232,6 +276,11 @@
     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
@@ -251,6 +300,11 @@
     name: 'daisy-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger'
     triggers:
       - timed: '0 20 * * *'
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-baremetal-daily-euphrates-trigger'
+    triggers:
+      - timed: ''
 
 # ----------------------------------------------
 # Triggers for job running on daisy-virtual against euphrates branch
@@ -270,3 +324,32 @@
     name: 'daisy-os-odl-nofeature-ha-virtual-daily-euphrates-trigger'
     triggers:
       - timed: '0 20 * * *'
+# ovs_dpdk Scenarios
+- trigger:
+    name: 'daisy-os-nosdn-ovs_dpdk-noha-virtual-daily-euphrates-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 10 * * *'
+# 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: ''