X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-daily-jobs.yaml;h=f90c5ef3a3e670d71ad82330d9ab6c0d9a607d5d;hb=1cfa467118efaf88d74aaa8b22b2daf247caa7c2;hp=fb619c3f57ed146b736221e84b800f1d3c1a0f22;hpb=d499499b994e67b8361754b4fa63be43c6a2b6b9;p=releng.git

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index fb619c3f5..f90c5ef3a 100644
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -16,16 +16,19 @@
       branch: '{stream}'
       disabled: false
       gs-pathname: ''
+      functest_docker_tag: hunter
     fraser: &fraser
       stream: fraser
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
+      functest_docker_tag: '{stream}'
     gambia: &gambia
       stream: gambia
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
+      functest_docker_tag: '{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -66,7 +69,7 @@
           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':
@@ -83,7 +86,7 @@
           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'
 
     exclude:
@@ -102,11 +105,11 @@
         stream: fraser
       - scenario: os-nosdn-ovs-noha
         stream: fraser
-      - scenario: os-nosdn-vpp-noha
+      - scenario: os-nosdn-fdio-noha
         stream: fraser
       - scenario: os-ovn-nofeature-ha
         stream: fraser
-      - scenario: os-nosdn-vpp-ha
+      - scenario: os-nosdn-fdio-ha
         stream: fraser
 
     jobs:
@@ -163,8 +166,9 @@
       - 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
       - conditional-step:
@@ -177,8 +181,10 @@
             - 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:
@@ -195,8 +201,9 @@
             - 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:
@@ -218,8 +225,9 @@
             - trigger-builds:
                 - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}'
                   current-parameters: false
-                  predefined-parameters:
+                  predefined-parameters: |
                     DEPLOY_SCENARIO={scenario}
+                    INSTALLER_VERSION={stream}
                   block: true
                   same-node: true
                   block-thresholds:
@@ -242,8 +250,9 @@
             - trigger-builds:
                 - project: 'dovetail-fuel-{pod}-default-optional-{stream}'
                   current-parameters: false
-                  predefined-parameters:
+                  predefined-parameters: |
                     DEPLOY_SCENARIO={scenario}
+                    INSTALLER_VERSION={stream}
                   block: true
                   same-node: true
                   block-thresholds:
@@ -253,8 +262,9 @@
       - 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:
@@ -366,7 +376,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:
@@ -380,7 +390,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: ''
 
@@ -414,9 +424,9 @@
     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: ''
+      - timed: '5 20 * * 3,5'
 # ----------------------------------------------
 # Triggers for job running on fuel-baremetal against gambia branch
 # ----------------------------------------------
@@ -424,7 +434,7 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-gambia-trigger'
     triggers:
-      - timed: '0 20 * * *'
+      - timed: '0 20 * * 1,2,4,6,7'
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-baremetal-daily-gambia-trigger'
     triggers:
@@ -438,7 +448,7 @@
     triggers:
       - timed: '0 5 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-vpp-ha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-gambia-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
@@ -471,9 +481,9 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vpp-noha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-gambia-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 20 * * 3,5'
 # ----------------------------------------------
 # Triggers for job running on fuel-virtual against master branch
 # ----------------------------------------------
@@ -494,7 +504,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
@@ -527,7 +537,7 @@
     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: ''
 # ----------------------------------------------
@@ -565,7 +575,7 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vpp-ha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-fdio-ha-virtual-daily-gambia-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
@@ -598,7 +608,7 @@
     triggers:
       - timed: '0 9 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-vpp-noha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-virtual-daily-gambia-trigger'
     triggers:
       - timed: ''
 # ----------------------------------------------
@@ -621,7 +631,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
@@ -654,6 +664,6 @@
     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: ''