X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-ci-jobs.yml;h=53155cc900aea443447c9f82dcf8894046fc1bc6;hb=f1cc83e3526dd0d30ac455b71d1d1a47e66d4318;hp=1080cd2782d86d241d426e669369832cbe844625;hpb=f92332f62856737a6d94c950c8073b8cee6f8e1a;p=releng.git

diff --git a/jjb/fuel/fuel-ci-jobs.yml b/jjb/fuel/fuel-ci-jobs.yml
index 1080cd278..53155cc90 100644
--- a/jjb/fuel/fuel-ci-jobs.yml
+++ b/jjb/fuel/fuel-ci-jobs.yml
@@ -14,75 +14,74 @@
         stream: master
         branch: '{stream}'
         gs-pathname: ''
-    brahmaputra: &brahmaputra
-        stream: brahmaputra
-        branch: 'stable/{stream}'
-        gs-pathname: '/{stream}'
 #--------------------------------
 # POD, INSTALLER, AND BRANCH MAPPING
 #--------------------------------
-#        brahmaputra
+#        CI PODs
 #--------------------------------
     pod:
-        - opnfv-jump-2:
-            <<: *brahmaputra
-        - ericsson-pod1:
-            <<: *brahmaputra
-        - ericsson-pod2:
-            <<: *brahmaputra
+        - baremetal:
+            slave-label: fuel-baremetal
+            <<: *master
         - virtual:
-            <<: *brahmaputra
+            slave-label: fuel-virtual
+            <<: *master
 #--------------------------------
-#        master
+#        None-CI PODs
 #--------------------------------
-        - opnfv-jump-2:
+        - zte-pod1:
+            slave-label: zte-pod1
             <<: *master
-        - ericsson-pod1:
+        - zte-pod2:
+            slave-label: zte-pod2
             <<: *master
-        - ericsson-pod2:
-            <<: *master
-        - virtual:
+        - zte-pod3:
+            slave-label: zte-pod3
             <<: *master
 #--------------------------------
 #       scenarios
 #--------------------------------
     scenario:
         # HA scenarios
+        - 'os-nosdn-nofeature-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-odl_l2-nofeature-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-odl_l3-nofeature-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-onos-sfc-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-onos-nofeature-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-odl_l2-sfc-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-odl_l2-bgpvpn-ha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-nosdn-kvm-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-nosdn-ovs-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-nofeature-ha':
-            auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
-        - 'os-odl_l2-bgpvpn-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-nosdn-kvm_ovs-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-nosdn-vlan-ha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'daily-trigger-disabled'
         # NOHA scenarios
+        - 'os-nosdn-nofeature-noha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-odl_l2-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-odl_l3-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-onos-sfc-noha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-onos-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-nosdn-nofeature-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-odl_l2-sfc-noha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+        - 'os-odl_l2-bgpvpn-noha':
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-nosdn-kvm-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-nosdn-kvm_ovs-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
         - 'os-nosdn-ovs-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
-        - 'os-odl_l2-bgpvpn-noha':
-            auto-trigger-name: 'brahmaputra-trigger-daily-disabled'
+            auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
 
     jobs:
         - 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -99,8 +98,9 @@
     properties:
         - throttle:
             enabled: true
-            max-total: 1
+            max-total: 4
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -118,7 +118,7 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults':
+        - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
@@ -127,6 +127,8 @@
             gs-pathname: '{gs-pathname}'
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - trigger-builds:
             - project: 'fuel-deploy-{pod}-daily-{stream}'
               current-parameters: false
@@ -135,7 +137,7 @@
               same-node: true
               block: true
         - trigger-builds:
-            - project: 'yardstick-fuel-{pod}-daily-{stream}'
+            - project: 'functest-fuel-{pod}-daily-{stream}'
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
@@ -146,7 +148,7 @@
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
         - trigger-builds:
-            - project: 'functest-fuel-{pod}-daily-{stream}'
+            - project: 'yardstick-fuel-{pod}-daily-{stream}'
               current-parameters: false
               predefined-parameters:
                 DEPLOY_SCENARIO={scenario}
@@ -157,16 +159,21 @@
                 failure-threshold: 'never'
                 unstable-threshold: 'FAILURE'
 
+    publishers:
+        - email:
+            recipients: peter.barabas@ericsson.com
+
 - job-template:
     name: 'fuel-deploy-{pod}-daily-{stream}'
 
-    concurrent: false
+    concurrent: true
 
     properties:
         - throttle:
             enabled: true
-            max-total: 1
+            max-total: 4
             max-per-node: 1
+            option: 'project'
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
@@ -178,7 +185,7 @@
         - project-parameter:
             project: '{project}'
         - '{installer}-defaults'
-        - '{pod}-defaults':
+        - '{slave-label}-defaults':
             installer: '{installer}'
         - string:
             name: DEPLOY_SCENARIO
@@ -195,8 +202,13 @@
     wrappers:
         - build-name:
             name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+        - timeout:
+            timeout: 150
+            abort: true
 
     builders:
+        - description-setter:
+            description: "POD: $NODE_NAME"
         - shell:
             !include-raw-escape: ./fuel-download-artifact.sh
         - shell:
@@ -204,7 +216,7 @@
 
     publishers:
         - email:
-            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com peter.barabas@ericsson.com
 
 ########################
 # parameter macros
@@ -228,206 +240,391 @@
 # trigger macros
 ########################
 # os-nosdn-nofeature-ha trigger
+# CI PODs
+#-----------------------------------------------
+# Triggers for job running on fuel-baremetal against master branch
+#-----------------------------------------------
+
+# HA Scenarios
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 20 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 23 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-master-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 2 * * *'
+- trigger:
+    name: 'fuel-os-onos-sfc-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 5 * * *'
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 8 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 11 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-baremetal-daily-master-trigger'
     triggers:
         - timed: '0 14 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-master-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 17 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: '0 20 * * *'
+
+# NOHA Scenarios
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-virtual-master-trigger'
+    name: 'fuel-os-odl_l3-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-opnfv-jump-2-brahmaputra-trigger'
+    name: 'fuel-os-onos-sfc-noha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
+    name: 'fuel-os-onos-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-sfc-noha-baremetal-daily-master-trigger'
     triggers:
-        - timed: '0 14 * * *'
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-noha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'fuel-os-nosdn-kvm-noha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-master-trigger'
+    triggers:
+        - timed: ''
+#-----------------------------------------------
+# Triggers for job running on fuel-virtual against master branch
+#-----------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-sfc-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-virtual-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-master-trigger'
     triggers:
         - timed: ''
 
-# os-nosdn-kvm-ha trigger
+# NOHA Scenarios
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-master-trigger'
+    triggers:
+        - timed: '0 13 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-noha-virtual-daily-master-trigger'
+    triggers:
+        - timed: '30 15 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-master-trigger'
+    name: 'fuel-os-odl_l3-nofeature-noha-virtual-daily-master-trigger'
     triggers:
         - timed: '0 18 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-master-trigger'
+    name: 'fuel-os-onos-sfc-noha-virtual-daily-master-trigger'
+    triggers:
+        - timed: '30 20 * * *'
+- trigger:
+    name: 'fuel-os-onos-nofeature-noha-virtual-daily-master-trigger'
+    triggers:
+        - timed: '0 23 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-noha-virtual-daily-master-trigger'
+    triggers:
+        - timed: '30 1 * * *'
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-noha-virtual-daily-master-trigger'
+    triggers:
+        - timed: '0 4 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-virtual-daily-master-trigger'
+    triggers:
+        - timed: '30 6 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-noha-virtual-daily-master-trigger'
+    triggers:
+        - timed: '0 9 * * *'
+
+#-----------------------------------------------
+# ZTE POD1 Triggers running against master branch
+#-----------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: '0 10 * * *'
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-virtual-master-trigger'
+    name: 'fuel-os-onos-sfc-ha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-opnfv-jump-2-brahmaputra-trigger'
+    name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod1-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-ericsson-pod2-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-sfc-ha-zte-pod1-daily-master-trigger'
     triggers:
-        - timed: '0 18 * * *'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-kvm-ha-virtual-brahmaputra-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
-
-# os-odl_l2-nofeature-ha trigger
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-master-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-zte-pod1-daily-master-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: ''
+# NOHA Scenarios
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-master-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-virtual-master-trigger'
+    name: 'fuel-os-odl_l3-nofeature-noha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-opnfv-jump-2-brahmaputra-trigger'
+    name: 'fuel-os-onos-sfc-noha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
+    name: 'fuel-os-onos-nofeature-noha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-sfc-noha-zte-pod1-daily-master-trigger'
     triggers:
-        - timed: '0 2 * * *'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l2-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-zte-pod1-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-noha-zte-pod1-daily-master-trigger'
     triggers:
         - timed: ''
 
-# os-odl_l3-nofeature-ha trigger
+#-----------------------------------------------
+# ZTE POD2 Triggers running against master branch
+#-----------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-zte-pod2-daily-master-trigger'
+    triggers:
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-zte-pod2-daily-master-trigger'
     triggers:
-        - timed: '0 6 * * *'
+        - timed: '0 10 * * *'
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-master-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-master-trigger'
+    name: 'fuel-os-onos-sfc-ha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-virtual-master-trigger'
+    name: 'fuel-os-onos-nofeature-ha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-opnfv-jump-2-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-sfc-ha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-zte-pod2-daily-master-trigger'
     triggers:
-        - timed: '0 6 * * *'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-odl_l3-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
-
-# os-onos-nofeature-ha trigger
+# NOHA Scenarios
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-master-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-zte-pod2-daily-master-trigger'
     triggers:
-        - timed: '0 10 * * */4'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-noha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-master-trigger'
+    name: 'fuel-os-odl_l3-nofeature-noha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-virtual-master-trigger'
+    name: 'fuel-os-onos-sfc-noha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-opnfv-jump-2-brahmaputra-trigger'
+    name: 'fuel-os-onos-nofeature-noha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-ericsson-pod1-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-sfc-noha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-ericsson-pod2-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod2-daily-master-trigger'
     triggers:
-        - timed: '0 10 * * */4'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-onos-nofeature-ha-virtual-brahmaputra-trigger'
+    name: 'fuel-os-nosdn-kvm-noha-zte-pod2-daily-master-trigger'
     triggers:
         - timed: ''
-
-
-# os-nosdn-ovs-ha trigger
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-master-trigger'
+    name: 'fuel-os-nosdn-ovs-noha-zte-pod2-daily-master-trigger'
+    triggers:
+        - timed: ''
+#-----------------------------------------------
+# ZTE POD3 Triggers running against master branch
+#-----------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-zte-pod3-daily-master-trigger'
     triggers:
-        - timed: '0 22 * * *'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-master-trigger'
+    name: 'fuel-os-odl_l2-nofeature-ha-zte-pod3-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-master-trigger'
+    name: 'fuel-os-odl_l3-nofeature-ha-zte-pod3-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-virtual-master-trigger'
+    name: 'fuel-os-onos-sfc-ha-zte-pod3-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-opnfv-jump-2-brahmaputra-trigger'
+    name: 'fuel-os-onos-nofeature-ha-zte-pod3-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-ericsson-pod1-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod3-daily-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-ericsson-pod2-brahmaputra-trigger'
+    name: 'fuel-os-odl_l2-sfc-ha-zte-pod3-daily-master-trigger'
     triggers:
-        - timed: '0 22 * * *'
+        - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-virtual-brahmaputra-trigger'
+    name: 'fuel-os-nosdn-kvm-ha-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: '0 10 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-zte-pod3-daily-master-trigger'
     triggers:
         - timed: ''
+# NOHA Scenarios
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-noha-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-noha-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-noha-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-sfc-noha-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-nofeature-noha-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-noha-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-noha-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-noha-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-noha-zte-pod3-daily-master-trigger'
+    triggers:
+        - timed: ''
+