X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-daily-jobs.yml;h=a214a56b8aabe3f68ad1d1bd097a2ff44be4f4c9;hb=a7e96beb40b827c9a4369bda79157a3324745bca;hp=902e7549938e09d5577b4b29e53989911ffabf8d;hpb=da95fe6416a07fde7619002395ed0ec5a956ce02;p=releng.git

diff --git a/jjb/fuel/fuel-daily-jobs.yml b/jjb/fuel/fuel-daily-jobs.yml
index 902e75499..a214a56b8 100644
--- a/jjb/fuel/fuel-daily-jobs.yml
+++ b/jjb/fuel/fuel-daily-jobs.yml
@@ -50,9 +50,6 @@
       - zte-pod1:
           slave-label: zte-pod1
           <<: *master
-      - zte-pod1:
-          slave-label: zte-pod1
-          <<: *euphrates
     # -------------------------------
     #       scenarios
     # -------------------------------
@@ -201,20 +198,59 @@
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
       # 1.here the stream means the SUT stream, dovetail stream is defined in its own job
-      # 2.only debug testsuite here(refstack, ha, vping, ipv6, tempest, bgpvpn)
-      # 3.not used for release criteria or compliance, only to debug the dovetail tool bugs
-      # 4.ZTE pod1, os-nosdn-nofeature-ha and os-odl-bgpvpn-ha, run against danube
-      - trigger-builds:
-          - project: 'dovetail-fuel-{pod}-proposed_tests-{stream}'
-            current-parameters: false
-            predefined-parameters:
-              DEPLOY_SCENARIO={scenario}
-            block: true
-            same-node: true
-            block-thresholds:
-              build-step-failure-threshold: 'never'
-              failure-threshold: 'never'
-              unstable-threshold: 'FAILURE'
+      # 2.testsuite proposed_tests here is for new test cases planning to add into OVP
+      # 3.run proposed_tests on Monday, Wednesday and Friday against ha scenario
+      # 4.testsuite default here is for the test cases already added into OVP
+      # 5.run default testsuite on Tuesday against ha scenario
+      # 6.not used for release criteria or compliance, only to debug the dovetail tool bugs
+      - conditional-step:
+          condition-kind: and
+          condition-operands:
+            - condition-kind: regex-match
+              regex: '-ha$'
+              label: '{scenario}'
+            - condition-kind: day-of-week
+              day-selector: select-days
+              days:
+                MON: true
+                WED: true
+                FRI: true
+              use-build-time: true
+          steps:
+            - trigger-builds:
+                - project: 'dovetail-fuel-{pod}-proposed_tests-{stream}'
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: 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: '-ha$'
+              label: '{scenario}'
+            - condition-kind: day-of-week
+              day-selector: select-days
+              days:
+                TUES: true
+              use-build-time: true
+          steps:
+            - trigger-builds:
+                - project: 'dovetail-fuel-{pod}-default-{stream}'
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
       - conditional-step:
           condition-kind: not
           condition-operand:
@@ -415,11 +451,11 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-euphrates-trigger'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: ''  # '0 20 * * *'
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-baremetal-daily-euphrates-trigger'
     triggers:
-      - timed: '0 2 * * *'
+      - timed: ''  # '0 2 * * *'
 - trigger:
     name: 'fuel-os-onos-sfc-ha-baremetal-daily-euphrates-trigger'
     triggers:
@@ -435,7 +471,7 @@
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-euphrates-trigger'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: ''  # '0 20 * * *'
 - trigger:
     name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-baremetal-daily-euphrates-trigger'
     triggers:
@@ -592,11 +628,11 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-euphrates-trigger'
     triggers:
-      - timed: '0 13 * * *'
+      - timed: ''  # '0 13 * * *'
 - trigger:
     name: 'fuel-os-odl-nofeature-noha-virtual-daily-euphrates-trigger'
     triggers:
-      - timed: '0 18 * * *'
+      - timed: ''  # '0 18 * * *'
 - trigger:
     name: 'fuel-os-onos-sfc-noha-virtual-daily-euphrates-trigger'
     triggers:
@@ -616,7 +652,7 @@
 - trigger:
     name: 'fuel-os-nosdn-ovs-noha-virtual-daily-euphrates-trigger'
     triggers:
-      - timed: '0 9 * * *'
+      - timed: ''  # '0 9 * * *'
 - trigger:
     name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-virtual-daily-euphrates-trigger'
     triggers:
@@ -631,7 +667,7 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-daily-master-trigger'
     triggers:
-      - timed: '0 22 * * *'
+      - timed: '0 10 * * *'
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-zte-pod1-daily-master-trigger'
     triggers:
@@ -697,75 +733,3 @@
     name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
-# ----------------------------------------------
-# ZTE POD1 Triggers running against euphrates branch
-# ----------------------------------------------
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: '0 10 * * *'
-- trigger:
-    name: 'fuel-os-odl-nofeature-ha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-onos-sfc-ha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-onos-nofeature-ha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm-ha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-ovs-ha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-ha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-ha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-# NOHA Scenarios
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-odl-nofeature-noha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-onos-sfc-noha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-onos-nofeature-noha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-ovn-nofeature-noha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm-noha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-ovs-noha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk-noha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-kvm_ovs_dpdk_bar-noha-zte-pod1-daily-euphrates-trigger'
-    triggers:
-      - timed: ''