Fix: gradle jobs triggers and scm

Issue: RELENG-4763
Signed-off-by: Kevin Sandi <ksandi@contractor.linuxfoundation.org>
Change-Id: I773d891518d4de8bf6fc0d5148664ba03958c3e1

diff --git a/jjb/lf-gradle-jobs.yaml b/jjb/lf-gradle-jobs.yaml
index 301770b..ba15f11 100644 (file)
--- a/jjb/lf-gradle-jobs.yaml
+++ b/jjb/lf-gradle-jobs.yaml
@@ -59,7 +59,7 @@
     publishers:
       - lf-infra-publish
 
-    gerrit_gradle_triggers:
+    gerrit_gradle_verify_triggers:
       - patchset-created-event:
           exclude-drafts: true
           exclude-trivial-rebase: false
@@ -68,6 +68,11 @@
       - comment-added-contains-event:
           comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
 
+    gerrit_gradle_merge_triggers:
+      - change-merged-event
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
+
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: ".*"
@@ -99,13 +104,13 @@
           submodule-recursive: "{submodule-recursive}"
           submodule-timeout: "{submodule-timeout}"
           submodule-disable: "{submodule-disable}"
-          choosing-strategy: default
+          choosing-strategy: gerrit
 
     triggers:
       - timed: "{obj:cron}"
       - gerrit:
           server-name: "{gerrit-server-name}"
-          trigger-on: "{obj:gerrit_gradle_triggers}"
+          trigger-on: "{obj:gerrit_gradle_verify_triggers}"
           projects:
             - project-compare-type: ANT
               project-pattern: "{project}"
@@ -187,7 +192,7 @@
       - timed: "{obj:cron}"
       - gerrit:
           server-name: "{gerrit-server-name}"
-          trigger-on: "{obj:gerrit_gradle_triggers}"
+          trigger-on: "{obj:gerrit_gradle_merge_triggers}"
           projects:
             - project-compare-type: ANT
               project-pattern: "{project}"

diff --git a/releasenotes/notes/fix-gradle-job-verify-93e93a2f5d6c6942.yaml b/releasenotes/notes/fix-gradle-job-verify-93e93a2f5d6c6942.yaml
new file mode 100644 (file)
index 0000000..ab69650
--- /dev/null
+++ b/releasenotes/notes/fix-gradle-job-verify-93e93a2f5d6c6942.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Fix Gradle job template where verify is not working/triggering correctly