X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel-verify-jobs.yaml;h=9b8b187ebe5812a5dd1411170313f49b8139fe11;hb=ec61d0dfae55acda30a431f680937018030e5c17;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..9b8b187eb 100644
--- a/jjb/fuel/fuel-verify-jobs.yaml
+++ b/jjb/fuel/fuel-verify-jobs.yaml
@@ -13,10 +13,12 @@
           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
     #####################################
@@ -68,7 +70,7 @@
           blocking-jobs:
             - 'fuel-os-.*?-daily-.*'
             - 'fuel-verify-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm-gerrit
@@ -146,8 +148,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 +173,7 @@
           blocking-jobs:
             - 'fuel-verify-docker-build-.*'
             - 'fuel-verify-deploy-.*'
-          block-level: 'NODE'
+          blocking-level: 'NODE'
 
     scm:
       - git-scm-gerrit
@@ -209,7 +212,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 +270,4 @@
     builders:
       - shell: |
           #!/bin/bash -ex
-          sudo ./ci/build.sh 'verify' ''
+          sudo -E ./ci/build.sh 'verify' ''