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

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 73d33d63b..7fa0c5c74 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -16,11 +16,13 @@
       branch: '{stream}'
       disabled: false
       gs-pathname: ''
-    fraser: &fraser
-      stream: fraser
+      functest_docker_tag: iruya
+    hunter: &hunter
+      stream: hunter
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
+      functest_docker_tag: '{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -35,16 +37,19 @@
           <<: *master
       - baremetal:
           slave-label: fuel-baremetal
-          <<: *fraser
+          <<: *hunter
       - virtual:
           slave-label: fuel-virtual
-          <<: *fraser
+          <<: *hunter
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
       - zte-pod1:
           slave-label: zte-pod1
           <<: *master
+      - itri-pod1:
+          slave-label: itri-pod1
+          <<: *master
     # -------------------------------
     #       scenarios
     # -------------------------------
@@ -58,29 +63,27 @@
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-ovs-ha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-nosdn-vpp-ha':
+      - 'os-nosdn-fdio-ha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       # NOHA scenarios
       - 'os-nosdn-nofeature-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-odl-nofeature-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+      - 'os-odl-sfc-noha':
+          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+      - 'os-odl-bgpvpn-noha':
+          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-ovn-nofeature-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-odl-ovs-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-ovs-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-      - 'os-nosdn-vpp-noha':
+      - 'os-nosdn-fdio-noha':
+          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+      - 'k8-calico-nofeature-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-
-    exclude:
-      - scenario: os-odl-ovs-noha
-        stream: fraser
-      - scenario: os-nosdn-vpp-ha
-        stream: fraser
-      - scenario: os-nosdn-vpp-noha
-        stream: fraser
 
     jobs:
       - 'fuel-{scenario}-{pod}-daily-{stream}'
@@ -107,9 +110,9 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'fuel-os-.*?-{pod}-daily-.*'
+            - 'fuel-(os|k8)-.*?-{pod}-daily-.*'
             - 'fuel-verify-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     wrappers:
       - build-name:
@@ -136,15 +139,18 @@
       - trigger-builds:
           - project: 'fuel-deploy-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
+            predefined-parameters: |
               DEPLOY_SCENARIO={scenario}
+              INSTALLER_VERSION={stream}
             same-node: true
             block: true
       - trigger-builds:
           - project: 'functest-fuel-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
+            predefined-parameters: |
               DEPLOY_SCENARIO={scenario}
+              INSTALLER_VERSION={stream}
+              DOCKER_TAG={functest_docker_tag}
             same-node: true
             block: true
             block-thresholds:
@@ -154,60 +160,21 @@
       - trigger-builds:
           - project: 'yardstick-fuel-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
+            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'
-      # 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
-      # 5.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}
-                  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}'
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-fuel-{pod}-default-optional-{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'
       - trigger-builds:
           - project: 'fuel-collect-logs-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
+            predefined-parameters: |
               DEPLOY_SCENARIO={scenario}
+              INSTALLER_VERSION={stream}
             block: true
             same-node: true
             block-thresholds:
@@ -237,7 +204,7 @@
           use-build-blocker: true
           blocking-jobs:
             - 'fuel-deploy-{pod}-daily-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     parameters:
       - project-parameter:
@@ -319,7 +286,7 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
-      - timed: '5 20 * * *'
+      - timed: '5 20 * * 1,2,4,6,7'
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-baremetal-daily-master-trigger'
     triggers:
@@ -333,7 +300,7 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vpp-ha-baremetal-daily-master-trigger'
+    name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''
 
@@ -346,6 +313,14 @@
     name: 'fuel-os-odl-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-odl-sfc-noha-baremetal-daily-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-master-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
@@ -359,44 +334,72 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vpp-noha-baremetal-daily-master-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-master-trigger'
+    triggers:
+      - timed: '5 20 * * 3,5'
+- trigger:
+    name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''
 # ----------------------------------------------
-# Triggers for job running on fuel-baremetal against fraser branch
+# Triggers for job running on fuel-baremetal against hunter branch
 # ----------------------------------------------
 # HA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-hunter-trigger'
     triggers:
-      - timed: '0 20 * * 1,3,7'
+      - timed: '0 20 * * 1,4,7'
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
+    name: 'fuel-os-odl-nofeature-ha-baremetal-daily-hunter-trigger'
     triggers:
-      - timed: ''  # '0 2 * * *'
+      - timed: '0 2 * * *'
 - trigger:
-    name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-fraser-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-fraser-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-hunter-trigger'
+    triggers:
+      - timed: '0 5 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-hunter-trigger'
     triggers:
-      - timed: ''  # '0 20 * * *'
+      - timed: ''
 # NOHA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-fraser-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-noha-baremetal-daily-fraser-trigger'
+    name: 'fuel-os-odl-nofeature-noha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-fraser-trigger'
+    name: 'fuel-os-odl-sfc-noha-baremetal-daily-hunter-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-hunter-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-hunter-trigger'
+    triggers:
+      - timed: '0 20 * * 6'
+- trigger:
+    name: 'fuel-os-odl-ovs-noha-baremetal-daily-hunter-trigger'
+    triggers:
+      - timed: '0 20 * * 2'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-fraser-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-hunter-trigger'
+    triggers:
+      - timed: '0 20 * * 3,5'
+- trigger:
+    name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 # ----------------------------------------------
@@ -419,7 +422,7 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vpp-ha-virtual-daily-master-trigger'
+    name: 'fuel-os-nosdn-fdio-ha-virtual-daily-master-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
@@ -431,6 +434,14 @@
     name: 'fuel-os-odl-nofeature-noha-virtual-daily-master-trigger'
     triggers:
       - timed: '5 18 * * *'
+- trigger:
+    name: 'fuel-os-odl-sfc-noha-virtual-daily-master-trigger'
+    triggers:
+      - timed: '5 4 * * 1,4'
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-master-trigger'
+    triggers:
+      - timed: '5 6 * * 2,5'
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger'
     triggers:
@@ -444,45 +455,73 @@
     triggers:
       - timed: '5 9 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-vpp-noha-virtual-daily-master-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-virtual-daily-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-k8-calico-nofeature-noha-virtual-daily-master-trigger'
+    triggers:
+      - timed: '5 16 * * *'
 # ----------------------------------------------
-# Triggers for job running on fuel-virtual against fraser branch
+# Triggers for job running on fuel-virtual against hunter branch
 # ----------------------------------------------
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-fraser-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-virtual-daily-fraser-trigger'
+    name: 'fuel-os-odl-nofeature-ha-virtual-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-ovn-nofeature-ha-virtual-daily-fraser-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-virtual-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-fraser-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-hunter-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-fdio-ha-virtual-daily-hunter-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-fraser-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-hunter-trigger'
     triggers:
-      - timed: ''  # '0 13 * * *'
+      - timed: '0 13 * * *'
 - trigger:
-    name: 'fuel-os-odl-nofeature-noha-virtual-daily-fraser-trigger'
+    name: 'fuel-os-odl-nofeature-noha-virtual-daily-hunter-trigger'
     triggers:
-      - timed: ''  # '0 18 * * *'
+      - timed: '0 18 * * *'
 - trigger:
-    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-fraser-trigger'
+    name: 'fuel-os-odl-sfc-noha-virtual-daily-hunter-trigger'
     triggers:
-      - timed: '5 23 * * *'
+      - timed: '0 4 * * 1,4'
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-hunter-trigger'
+    triggers:
+      - timed: '0 7 * * 2,5'
+- trigger:
+    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-hunter-trigger'
+    triggers:
+      - timed: '0 23 * * *'
+- trigger:
+    name: 'fuel-os-odl-ovs-noha-virtual-daily-hunter-trigger'
+    triggers:
+      - timed: '0 2 * * *'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-noha-virtual-daily-hunter-trigger'
+    triggers:
+      - timed: '0 9 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-noha-virtual-daily-fraser-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-virtual-daily-hunter-trigger'
     triggers:
-      - timed: ''  # '0 9 * * *'
+      - timed: '0 13 * * 6,7'
+- trigger:
+    name: 'fuel-k8-calico-nofeature-noha-virtual-daily-hunter-trigger'
+    triggers:
+      - timed: '5 13 * * 6,7'
 # ----------------------------------------------
 # ZTE POD1 Triggers running against master branch
 # ----------------------------------------------
@@ -503,7 +542,7 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vpp-ha-zte-pod1-daily-master-trigger'
+    name: 'fuel-os-nosdn-fdio-ha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
@@ -515,6 +554,14 @@
     name: 'fuel-os-odl-nofeature-noha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-odl-sfc-noha-zte-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-zte-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-zte-pod1-daily-master-trigger'
     triggers:
@@ -528,6 +575,70 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vpp-noha-zte-pod1-daily-master-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-zte-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    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'