X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-maven-jobs.yaml;h=f8982c067709581f98147c28b8b0741c8e49cb9c;hb=54f65edc2d552a099449a5cf1af2f0071fa722a6;hp=7c47aece8694a382a589877b17b5b58709a76564;hpb=9bfbfe860f631c092a09612e3d0e3703c31f2f65;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 7c47aece..f8982c06 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -29,7 +29,7 @@
           condition-expression: '{maven-versions-plugin}'
           steps:
             - inject:
-                properties-file: version.properties
+                properties-file: '{version-properties-file}'
             - maven-target:
                 maven-version: '{mvn-version}'
                 pom: '{mvn-pom}'
@@ -161,7 +161,7 @@
 
     gerrit_clm_triggers:
       - comment-added-contains-event:
-          comment-contains-value: run-clm$
+          comment-contains-value: '^Patch Set\s+\d+:\s+run-clm\s*$'
 
     parameters:
       - lf-infra-parameters:
@@ -312,7 +312,7 @@
     gerrit_merge_triggers:
       - change-merged-event
       - comment-added-contains-event:
-          comment-contains-value: remerge$
+          comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
 
     #####################
     # Job Configuration #
@@ -445,7 +445,7 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+          comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
 
     #####################
     # Job Configuration #
@@ -564,7 +564,7 @@
     gerrit_merge_triggers:
       - change-merged-event
       - comment-added-contains-event:
-          comment-contains-value: remerge$
+          comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -815,6 +815,7 @@
     github-url: 'https://github.com'
     java-version: openjdk8
     maven-versions-plugin: false
+    version-properties-file: version.properties
     mvn-central: false
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -832,7 +833,7 @@
 
     gerrit_release_triggers:
       - comment-added-contains-event:
-          comment-contains-value: stage-release$
+          comment-contains-value: '^Patch Set\s+\d+:\s+stage-release\s*$'
 
     gerrit_trigger_file_paths:
       - compare-type: ANT
@@ -883,6 +884,7 @@
           settings-file: '{mvn-settings}'
       - lf-maven-versions-plugin:
           maven-versions-plugin: '{maven-versions-plugin}'
+          version-properties-file: '{version-properties-file}'
           mvn-version: '{mvn-version}'
           mvn-pom: '{mvn-pom}'
           mvn-settings: '{mvn-settings}'
@@ -992,12 +994,13 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
-      - shell: !include-raw-escape: ../shell/maven-patch-release.sh
       - lf-maven-versions-plugin:
           maven-versions-plugin: '{maven-versions-plugin}'
+          version-properties-file: '{version-properties-file}'
           mvn-version: '{mvn-version}'
           mvn-pom: '{mvn-pom}'
           mvn-settings: '{mvn-settings}'
+      - shell: !include-raw-escape: ../shell/maven-patch-release.sh
       - inject:
           properties-content: |
               CONTAINER_PULL_REGISTRY={container-public-registry}
@@ -1118,7 +1121,7 @@
 
     gerrit_sonar_triggers:
       - comment-added-contains-event:
-          comment-contains-value: run-sonar$
+          comment-contains-value: '^Patch Set\s+\d+:\s+run-sonar\s*$'
 
     #####################
     # Job Configuration #
@@ -1331,7 +1334,7 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+          comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP