X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-daily-jobs.yaml;h=9a8d8098757b8ceda189beb5b05796e98fecbd90;hb=7eb145cbdd0687452b703c0cff3d692529d78695;hp=36de6fda72879eb092758d060444fae3c136e2ba;hpb=dcc85bb57ef9c5740dfbec5e0eda9c00c0d9ff47;p=releng.git

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 36de6fda7..9a8d80987 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -16,7 +16,7 @@
       branch: '{stream}'
       disabled: false
       gs-pathname: ''
-      functest_docker_tag: hunter
+      functest_docker_tag: iruya
     hunter: &hunter
       stream: hunter
       branch: 'stable/{stream}'
@@ -47,6 +47,9 @@
       - zte-pod1:
           slave-label: zte-pod1
           <<: *master
+      - itri-pod1:
+          slave-label: itri-pod1
+          <<: *master
     # -------------------------------
     #       scenarios
     # -------------------------------
@@ -166,6 +169,67 @@
               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
@@ -434,11 +498,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:
@@ -494,11 +558,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:
@@ -579,3 +643,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'