X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farmband%2Farmband-ci-jobs.yaml;h=568cb9b9d1d1a4f9747c9a10ee711b56efaffac6;hb=1cfa467118efaf88d74aaa8b22b2daf247caa7c2;hp=2ab1a6d536085f79d3f8c6474126b51434d6f060;hpb=4dc709177cdd7a78aa826c6764ea30a65a1c5b78;p=releng.git

diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml
index 2ab1a6d53..568cb9b9d 100644
--- a/jjb/armband/armband-ci-jobs.yaml
+++ b/jjb/armband/armband-ci-jobs.yaml
@@ -12,16 +12,19 @@
       branch: '{stream}'
       gs-pathname: ''
       disabled: false
+      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}'
       gs-pathname: '/{stream}'
       disabled: false
+      functest_docker_tag: '{stream}'
     # -------------------------------
     # DEPLOY TYPE ANCHORS
     # -------------------------------
@@ -78,12 +81,12 @@
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
       - 'os-nosdn-ovs-ha':
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
-      - 'os-nosdn-vpp-ha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 
       # NOHA scenarios
       - 'os-nosdn-nofeature-noha':
           auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-fdio-noha':
+          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
 
     exclude:
       # Dovetail (and only it) should run against Fraser HA baremetal scenarios
@@ -91,7 +94,7 @@
         stream: fraser
       - scenario: os-ovn-nofeature-ha
         stream: fraser
-      - scenario: os-nosdn-vpp-ha
+      - scenario: os-nosdn-fdio-noha
         stream: fraser
 
     jobs:
@@ -145,8 +148,9 @@
       - trigger-builds:
           - project: '{installer}-deploy-{pod}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
+            predefined-parameters: |
               DEPLOY_SCENARIO={scenario}
+              INSTALLER_VERSION={stream}
             same-node: true
             block: true
       - conditional-step:
@@ -159,8 +163,10 @@
             - trigger-builds:
                 - project: 'functest-{installer}-{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:
@@ -177,8 +183,9 @@
             - trigger-builds:
                 - project: 'yardstick-{installer}-{pod}-daily-{stream}'
                   current-parameters: false
-                  predefined-parameters:
+                  predefined-parameters: |
                     DEPLOY_SCENARIO={scenario}
+                    INSTALLER_VERSION={stream}
                   block: true
                   same-node: true
                   block-thresholds:
@@ -205,8 +212,9 @@
             - trigger-builds:
                 - project: 'dovetail-{installer}-{pod}-proposed_tests-{stream}'
                   current-parameters: false
-                  predefined-parameters:
+                  predefined-parameters: |
                     DEPLOY_SCENARIO={scenario}
+                    INSTALLER_VERSION={stream}
                   block: true
                   same-node: true
                   block-thresholds:
@@ -226,8 +234,9 @@
             - trigger-builds:
                 - project: 'dovetail-{installer}-{pod}-default-{stream}'
                   current-parameters: false
-                  predefined-parameters:
+                  predefined-parameters: |
                     DEPLOY_SCENARIO={scenario}
+                    INSTALLER_VERSION={stream}
                   block: true
                   same-node: true
                   block-thresholds:
@@ -238,8 +247,9 @@
       - trigger-builds:
           - project: 'fuel-collect-logs-{deploy-type}-daily-{stream}'
             current-parameters: false
-            predefined-parameters:
+            predefined-parameters: |
               DEPLOY_SCENARIO={scenario}
+              INSTALLER_VERSION={stream}
             block: true
             same-node: true
             block-thresholds:
@@ -310,11 +320,7 @@
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
-      - timed: '0 1 * * 2,7'
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-master-trigger'
-    triggers:
-      - timed: ''
+      - timed: '0 1 * * 7'
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
@@ -322,30 +328,30 @@
 - trigger:
     name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-master-trigger'
     triggers:
-      - timed: '0 1 * * 1'
+      - timed: '0 1 * * 2'
 - trigger:
     name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-master-trigger'
     triggers:
-      - timed: '0 1 * * 3,5'
+      - timed: '0 1 * * 1'
 - trigger:
-    name: 'fuel-os-nosdn-vpp-ha-armband-baremetal-master-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-fdio-noha-armband-baremetal-master-trigger'
+    triggers:
+      - timed: '0 1 * * 3,5'
 # ---------------------------------------------------------------------
 # Enea Armband CI Baremetal Triggers running against gambia branch
 # ---------------------------------------------------------------------
 - trigger:
     name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-gambia-trigger'
     triggers:
-      - timed: '10 1 * * 1,3'
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-gambia-trigger'
-    triggers:
-      - timed: ''
+      - timed: '10 1 * * 1'
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-armband-baremetal-gambia-trigger'
     triggers:
-      - timed: '10 1 * * 5,7'
+      - timed: '10 1 * * 7'
 - trigger:
     name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-gambia-trigger'
     triggers:
@@ -355,9 +361,13 @@
     triggers:
       - timed: '10 1 * * 4,6'
 - trigger:
-    name: 'fuel-os-nosdn-vpp-ha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-gambia-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-fdio-noha-armband-baremetal-gambia-trigger'
+    triggers:
+      - timed: '10 1 * * 3,5'
 # -------------------------------------------------------------------
 # Enea Armband CI Baremetal Triggers running against fraser branch (for Dovetail)
 # -------------------------------------------------------------------
@@ -380,10 +390,6 @@
     name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-master-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-armband-virtual-master-trigger'
     triggers:
@@ -397,7 +403,11 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vpp-ha-armband-virtual-master-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-fdio-noha-armband-virtual-master-trigger'
     triggers:
       - timed: ''
 # -------------------------------------------------------------------
@@ -407,10 +417,6 @@
     name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-gambia-trigger'
     triggers:
       - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
 - trigger:
     name: 'fuel-os-odl-nofeature-ha-armband-virtual-gambia-trigger'
     triggers:
@@ -424,6 +430,10 @@
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-vpp-ha-armband-virtual-gambia-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-gambia-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-fdio-noha-armband-virtual-gambia-trigger'
     triggers:
       - timed: ''