From 19cb59a5d60873873f6905b97266a8e919796dbc Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 31 Oct 2019 19:27:20 +0530 Subject: [PATCH] Update docker job templates gerrit trigger regexes Update the gerrit trigger regexes for the docker job templates to use shorter and more readable versions of the regexes also used in other verify and merge job templates. Change-Id: I8c189735c472ff22d9dd5093017234e74a2ac5c2 Signed-off-by: Anil Belur Signed-off-by: Lott, Christopher (cl778h) --- docs/jjb/lf-docker-jobs.rst | 8 ++++++-- jjb/lf-docker-jobs.yaml | 4 ++-- .../notes/docker-job-gerrit-trigger-regex-62e442cadcce9356.yaml | 7 +++++++ 3 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/docker-job-gerrit-trigger-regex-62e442cadcce9356.yaml diff --git a/docs/jjb/lf-docker-jobs.rst b/docs/jjb/lf-docker-jobs.rst index 4a91dc7f..354c77e7 100644 --- a/docs/jjb/lf-docker-jobs.rst +++ b/docs/jjb/lf-docker-jobs.rst @@ -54,7 +54,9 @@ Executes a docker build task. - gerrit-docker-verify - github-docker-verify -:Comment Trigger: recheck|reverify +:Comment Trigger: **recheck|reverify** post a comment with one of the + triggers to launch this job manually. Do not include any additional + text or vote in the same comment. :Required parameters: @@ -116,7 +118,9 @@ Executes a docker build task and publishes the resulting images to a specified D - gerrit-docker-merge - github-docker-merge -:Comment Trigger: remerge +:Comment Trigger: **remerge** post a comment with the trigger to launch + this job manually. Do not include any additional text or vote in the + same comment. :Required parameters: diff --git a/jjb/lf-docker-jobs.yaml b/jjb/lf-docker-jobs.yaml index 4a7f297f..1f9635c3 100644 --- a/jjb/lf-docker-jobs.yaml +++ b/jjb/lf-docker-jobs.yaml @@ -119,7 +119,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 @@ -166,7 +166,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 diff --git a/releasenotes/notes/docker-job-gerrit-trigger-regex-62e442cadcce9356.yaml b/releasenotes/notes/docker-job-gerrit-trigger-regex-62e442cadcce9356.yaml new file mode 100644 index 00000000..a789db29 --- /dev/null +++ b/releasenotes/notes/docker-job-gerrit-trigger-regex-62e442cadcce9356.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + Update the gerrit trigger regexes for the docker job templates + to use the shorter and more readable versions of the regexes + used in other verify and merge job templates. + Clarify documentation for comment triggers. -- 2.16.6