Merge "Fill stable branch details"

[releng.git] / jjb / fuel / fuel-verify-jobs.yaml

diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml
index 58d7ce6..ea27d9c 100644 (file)
--- a/jjb/fuel/fuel-verify-jobs.yaml
+++ b/jjb/fuel/fuel-verify-jobs.yaml
@@ -147,7 +147,7 @@
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               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
 
@@ -209,7 +209,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 +267,4 @@
     builders:
       - shell: |
           #!/bin/bash -ex
-          sudo ./ci/build.sh 'verify' ''
+          sudo -E ./ci/build.sh 'verify' ''