X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-verify-jobs.yaml;h=d3182377011dc5c382ba6c20acfe24f6e2a5a23f;hb=2d1096b33e73d6ae734398266222bd578548e475;hp=fb9f50225fb18a550f57836466c7fde6e0fb8a63;hpb=0e4c022e3214ca9a0a5a306619c2b26c55367248;p=releng.git

diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml
index fb9f50225..d31823770 100644
--- a/jjb/fuel/fuel-verify-jobs.yaml
+++ b/jjb/fuel/fuel-verify-jobs.yaml
@@ -13,20 +13,20 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - fraser:
+          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
     #####################################
@@ -68,7 +68,7 @@
           blocking-jobs:
             - 'fuel-os-.*?-daily-.*'
             - 'fuel-verify-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm-gerrit
@@ -146,8 +146,9 @@
                 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_NAME' !=~ 'arm-virtual'"
+              enable-condition: "def m = ! ('$NODE_LABELS' =~ /armband-virtual/)"
               kill-phase-on: NEVER
               abort-all-job: true
 
@@ -170,7 +171,7 @@
           blocking-jobs:
             - 'fuel-verify-docker-build-.*'
             - 'fuel-verify-deploy-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm-gerrit