X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-daily-jobs.yaml;h=7fa0c5c741960e7e5c939e4d4c06a4d3026cc257;hb=adcb86b47d623600a06a0ec13615dd1d15ae9984;hp=7bf29dab3e755f8a79db988514ae7b4b35a85f9d;hpb=73de1ddbf655014677320bd7aa946073253e6d06;p=releng.git

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 7bf29dab3..7fa0c5c74 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -16,11 +16,11 @@
       branch: '{stream}'
       disabled: false
       gs-pathname: ''
-      functest_docker_tag: hunter
+      functest_docker_tag: iruya
     hunter: &hunter
       stream: hunter
       branch: 'stable/{stream}'
-      disabled: true
+      disabled: false
       gs-pathname: '/{stream}'
       functest_docker_tag: '{stream}'
     # -------------------------------
@@ -47,6 +47,9 @@
       - zte-pod1:
           slave-label: zte-pod1
           <<: *master
+      - itri-pod1:
+          slave-label: itri-pod1
+          <<: *master
     # -------------------------------
     #       scenarios
     # -------------------------------
@@ -166,67 +169,6 @@
               build-step-failure-threshold: 'never'
               failure-threshold: 'never'
               unstable-threshold: 'FAILURE'
-      # 1.here the stream means the SUT stream, dovetail stream is defined in its own job
-      # 2.testsuite default here is for the test cases already added into OVP
-      # 3.run default testsuite mandatory test cases against ha scenario
-      # 4.run default testsuite optional test cases against ha scenario twice one week
-      # 5.run proposed_tests testsuite optional test cases 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}'
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-                - project: 'dovetail-fuel-{pod}-proposed_tests-optional-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  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:
-                MON: true
-                WED: true
-              use-build-time: true
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-fuel-{pod}-default-optional-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
       - trigger-builds:
           - project: 'fuel-collect-logs-{pod}-daily-{stream}'
             current-parameters: false
@@ -406,7 +348,7 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-hunter-trigger'
     triggers:
-      - timed: '0 20 * * 1,2,4,6,7'
+      - timed: '0 20 * * 1,4,7'
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-baremetal-daily-hunter-trigger'
     triggers:
@@ -443,11 +385,11 @@
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-hunter-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 20 * * 6'
 - trigger:
     name: 'fuel-os-odl-ovs-noha-baremetal-daily-hunter-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 20 * * 2'
 - trigger:
     name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-hunter-trigger'
     triggers:
@@ -495,11 +437,11 @@
 - trigger:
     name: 'fuel-os-odl-sfc-noha-virtual-daily-master-trigger'
     triggers:
-      - timed: '5 4 * * *'
+      - timed: '5 4 * * 1,4'
 - trigger:
     name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-master-trigger'
     triggers:
-      - timed: '5 6 * * *'
+      - timed: '5 6 * * 2,5'
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger'
     triggers:
@@ -555,11 +497,11 @@
 - trigger:
     name: 'fuel-os-odl-sfc-noha-virtual-daily-hunter-trigger'
     triggers:
-      - timed: '0 4 * * *'
+      - timed: '0 4 * * 1,4'
 - trigger:
     name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-hunter-trigger'
     triggers:
-      - timed: '0 7 * * *'
+      - timed: '0 7 * * 2,5'
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-virtual-daily-hunter-trigger'
     triggers:
@@ -640,3 +582,63 @@
     name: 'fuel-k8-calico-nofeature-noha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
+# ----------------------------------------------
+# ITRI POD1 Triggers running against master branch
+# ----------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 1'
+- trigger:
+    name: 'fuel-os-odl-nofeature-ha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 17 * * 1'
+- trigger:
+    name: 'fuel-os-ovn-nofeature-ha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 2'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 17 * * 2'
+- trigger:
+    name: 'fuel-os-nosdn-fdio-ha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
+# NOHA Scenarios
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 3'
+- trigger:
+    name: 'fuel-os-odl-nofeature-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 17 * * 3'
+- trigger:
+    name: 'fuel-os-odl-sfc-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 4'
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-ovn-nofeature-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 17 * * 4'
+- trigger:
+    name: 'fuel-os-odl-ovs-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 5'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 17 * * 5'
+- trigger:
+    name: 'fuel-os-nosdn-fdio-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-k8-calico-nofeature-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 6'