From 69a1ee32f4dd23820dccb2b3773d3626457b617f Mon Sep 17 00:00:00 2001 From: Abirdcfly Date: Fri, 22 Apr 2022 16:28:11 +0800 Subject: [PATCH] add parsing release-note no block Signed-off-by: Abirdcfly --- prow/plugins/releasenote/releasenote.go | 2 +- prow/plugins/releasenote/releasenote_test.go | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/prow/plugins/releasenote/releasenote.go b/prow/plugins/releasenote/releasenote.go index dd6bf9506990..282319774e5e 100644 --- a/prow/plugins/releasenote/releasenote.go +++ b/prow/plugins/releasenote/releasenote.go @@ -52,7 +52,7 @@ var ( noteMatcherRE = regexp.MustCompile(`(?s)(?:Release note\*\*:\s*(?:\s*)?` + "```(?:release-note)?|```release-note)(.+?)```") cpRe = regexp.MustCompile(`Cherry pick of #([[:digit:]]+) on release-([[:digit:]]+\.[[:digit:]]+).`) - noneRe = regexp.MustCompile(`(?i)^\W*NONE\W*$`) + noneRe = regexp.MustCompile(`(?i)^\W*(NONE|NO)\W*$`) allRNLabels = []string{ labels.ReleaseNoteNone, diff --git a/prow/plugins/releasenote/releasenote_test.go b/prow/plugins/releasenote/releasenote_test.go index 4fad5de5fb99..6dedc0aaf14a 100644 --- a/prow/plugins/releasenote/releasenote_test.go +++ b/prow/plugins/releasenote/releasenote_test.go @@ -83,6 +83,17 @@ func TestReleaseNoteComment(t *testing.T) { deletedLabels: []string{labels.ReleaseNoteLabelNeeded}, addedLabel: labels.ReleaseNoteNone, }, + { + name: "author release-note-none with \"no\" block", + action: github.IssueCommentActionCreated, + isAuthor: true, + commentBody: "/release-note-none", + issueBody: "bologna ```release-note \nno \n ```", + currentLabels: []string{labels.ReleaseNoteLabelNeeded, "other"}, + + deletedLabels: []string{labels.ReleaseNoteLabelNeeded}, + addedLabel: labels.ReleaseNoteNone, + }, { name: "author release-note-none, trailing space.", action: github.IssueCommentActionCreated,