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

diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml
index 9694ba9..7a878f4 100644 (file)
--- 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
     # -------------------------------
@@ -161,6 +164,7 @@
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
+                    DOCKER_TAG={functest_docker_tag}
                   same-node: true
                   block: true
                   block-thresholds:

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 3e64c16..6520570 100644 (file)
--- 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
     # -------------------------------
@@ -179,6 +182,7 @@
                   current-parameters: false
                   predefined-parameters:
                     DEPLOY_SCENARIO={scenario}
+                    DOCKER_TAG={functest_docker_tag}
                   same-node: true
                   block: true
                   block-thresholds:

diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml
index 3a7af7d..d318237 100644 (file)
--- a/jjb/fuel/fuel-verify-jobs.yaml
+++ b/jjb/fuel/fuel-verify-jobs.yaml
@@ -13,10 +13,12 @@
           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
     #####################################
@@ -144,6 +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