X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdaisy4nfv%2Fdaisy-daily-jobs.yml;h=5a0e321f01597d36c027f8a9bf2cb34b401adf23;hb=dc7000ff2c74bc5e91aadd3e48a25f8d2edccd4b;hp=e61272ceecc07208d4c85c3232f20f59fec642d9;hpb=887a414ea4c37137f051e2be1eb5698af7b63486;p=releng.git

diff --git a/jjb/daisy4nfv/daisy-daily-jobs.yml b/jjb/daisy4nfv/daisy-daily-jobs.yml
index e61272cee..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}'
@@ -126,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:
@@ -133,6 +141,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
             block-thresholds:
@@ -154,6 +165,9 @@
                   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:
@@ -209,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
@@ -235,6 +252,11 @@
     name: 'daisy-os-odl-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
       - 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
@@ -254,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
@@ -273,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
@@ -292,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: ''