Merge "[fuel] Run functest hunter against master branch"

diff --combined jjb/armband/armband-ci-jobs.yaml
index 9694ba9,df01dda..7a878f4
--- 1/jjb/armband/armband-ci-jobs.yaml
--- 2/jjb/armband/armband-ci-jobs.yaml
+++ b/jjb/armband/armband-ci-jobs.yaml
@@@ -12,16 -12,19 +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 +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 +94,7 @@@
          stream: fraser
        - scenario: os-ovn-nofeature-ha
          stream: fraser
 -      - scenario: os-nosdn-vpp-ha
 +      - scenario: os-nosdn-fdio-noha
          stream: fraser
  
      jobs:
@@@ -161,6 -164,7 +164,7 @@@
                    current-parameters: false
                    predefined-parameters:
                      DEPLOY_SCENARIO={scenario}
+                     DOCKER_TAG={functest_docker_tag}
                    same-node: true
                    block: true
                    block-thresholds:
@@@ -310,7 -314,11 +314,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:
@@@ -318,30 -326,30 +322,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:
@@@ -351,13 -359,9 +355,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,6 -384,10 +384,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:
@@@ -393,11 -401,7 +397,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,6 -411,10 +411,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:
@@@ -420,10 -428,6 +424,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: ''

diff --combined jjb/fuel/fuel-daily-jobs.yaml
index 3e64c16,57ed85f..6520570
--- 1/jjb/fuel/fuel-daily-jobs.yaml
--- 2/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@@ -16,16 -16,19 +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 +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 +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 +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:
@@@ -179,6 -182,7 +182,7 @@@
                    current-parameters: false
                    predefined-parameters:
                      DEPLOY_SCENARIO={scenario}
+                     DOCKER_TAG={functest_docker_tag}
                    same-node: true
                    block: true
                    block-thresholds:
@@@ -366,7 -370,7 +370,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 -384,7 +384,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 -418,9 +418,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 -428,7 +428,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 -442,7 +442,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 -475,9 +475,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 -498,7 +498,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 -531,7 +531,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 -569,7 +569,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 -602,7 +602,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 -625,7 +625,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 -658,6 +658,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: ''

diff --combined jjb/fuel/fuel-verify-jobs.yaml
index 3a7af7d,9b8b187..d318237
--- 1/jjb/fuel/fuel-verify-jobs.yaml
--- 2/jjb/fuel/fuel-verify-jobs.yaml
+++ b/jjb/fuel/fuel-verify-jobs.yaml
@@@ -13,18 -13,22 +13,20 @@@
            branch: '{stream}'
            gs-pathname: ''
            disabled: false
+           functest_docker_tag: hunter
        - gambia:
            branch: 'stable/{stream}'
            gs-pathname: '/{stream}'
            disabled: false
+           functest_docker_tag: '{stream}'
      #####################################
      # cluster architectures
      #####################################
 +    # Note: arm64 was removed since it was basically a no-op
      arch_tag:
        - 'amd64':
            slave-label: 'fuel'
            functest-suite-label: 'fuel'
 -      - 'arm64':
 -          slave-label: 'armband'
 -          functest-suite-label: 'fuel-armband'
      #####################################
      # cluster types
      #####################################
@@@ -144,6 -148,7 +146,7 @@@
                  GERRIT_REFSPEC=$GERRIT_REFSPEC
                  GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                  GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                 DOCKER_TAG={functest_docker_tag}
                node-parameters: true
                enable-condition: "def m = ! ('$NODE_LABELS' =~ /armband-virtual/)"
                kill-phase-on: NEVER