From 515b63742146d50a9989ccc6e1507b49946cef3d Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Wed, 30 Oct 2019 20:27:13 -0400 Subject: [PATCH] Repair comment regexes on release templates Change the comment-added-contains-event string for the release-verify and release-merge templates to the same regexes used in all other verify and merge templates, instead of custom versions that didn't work; verify now uses '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' merge now uses '^Patch Set\s+\d+:\s+remerge\s*$' Change-Id: I4436568046ffbc15225115726e2664824bd6bea2 Signed-off-by: Lott, Christopher (cl778h) --- jjb/lf-release-jobs.yaml | 6 +++--- .../notes/fix-release-job-comment-triggers-692baf00dabe99e8.yaml | 8 ++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/fix-release-job-comment-triggers-692baf00dabe99e8.yaml diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml index c2bb7492..c8384824 100644 --- a/jjb/lf-release-jobs.yaml +++ b/jjb/lf-release-jobs.yaml @@ -53,8 +53,8 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: | - ^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$ + # yamllint disable-line rule:line-length + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' ##################### # Job Configuration # @@ -158,7 +158,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 # diff --git a/releasenotes/notes/fix-release-job-comment-triggers-692baf00dabe99e8.yaml b/releasenotes/notes/fix-release-job-comment-triggers-692baf00dabe99e8.yaml new file mode 100644 index 00000000..1687fa64 --- /dev/null +++ b/releasenotes/notes/fix-release-job-comment-triggers-692baf00dabe99e8.yaml @@ -0,0 +1,8 @@ +--- +fixes: + - | + Change the comment-added-contains-event strings for the release-verify and + release-merge templates to the same regexes used in other verify and merge + templates, instead of custom versions that didn't seem to work; + verify now uses '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' + merge now uses '^Patch Set\s+\d+:\s+remerge\s*$' -- 2.16.6