X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-verify-jobs.yaml;h=0248907223ac2dfeea18b10acd228dd451cfbc86;hb=adcb86b47d623600a06a0ec13615dd1d15ae9984;hp=58d7ce6ba4dfb7c84a73407e248487dfe3430004;hpb=096247edf3195d4249787b01a73b8ad1ea4a200e;p=releng.git

diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml
index 58d7ce6ba..024890722 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: iruya
+      - hunter:
           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
     #####################################
@@ -66,9 +66,9 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'fuel-os-.*?-daily-.*'
+            - 'fuel-(os|k8)-.*?-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
@@ -209,7 +210,7 @@
                 exclude-no-code-change: 'false'
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: '(recheck|reverify)(\s|:\s*[-\w]+-noha)'
+                comment-contains-value: '(recheck|reverify)(\s|$|:\s*[-\w]+-noha)'
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
@@ -267,4 +268,4 @@
     builders:
       - shell: |
           #!/bin/bash -ex
-          sudo ./ci/build.sh 'verify' ''
+          sudo -E ./ci/build.sh 'verify' ''