From: Kevin Sandi Date: Thu, 24 Aug 2023 06:54:50 +0000 (-0600) Subject: Fix: gradle jobs triggers and scm X-Git-Tag: v0.88.6^0 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=83db02b5609d9347b216ae1e9419ec0bfcb86397;p=releng%2Fglobal-jjb.git Fix: gradle jobs triggers and scm Issue: RELENG-4763 Signed-off-by: Kevin Sandi Change-Id: I773d891518d4de8bf6fc0d5148664ba03958c3e1 --- diff --git a/jjb/lf-gradle-jobs.yaml b/jjb/lf-gradle-jobs.yaml index 301770b6..ba15f119 100644 --- 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 index 00000000..ab696504 --- /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