Merge pull request #3974 from IrvingMg/fix/generation-release-notes-with-reverted-prs

Include revert PR instead of the reverted one in release notes

Author: k8s-ci-robot

pkg/notes/notes.go

@@ -1136,6 +1136,13 @@ func prsNumForCommitFromMessage(commitMessage string) (prs []int, err error) {
 		prs = append(prs, pr)
 	}
 
+	regex = regexp.MustCompile(`\(#(?P<number>\d+)\)\s*\n\nThis reverts commit`)
+
+	pr = prForRegex(regex, commitMessage)
+	if pr != 0 {
+		prs = append(prs, pr)
+	}
+
 	// If the PR was squash merged, the regexp is different
 	regex = regexp.MustCompile(`\(#(?P<number>\d+)\)`)
 

pkg/notes/notes_test.go

@@ -223,6 +223,14 @@ func TestGetPRNumberFromCommitMessage(t *testing.T) {
 			commitMessage:    "Add swapoff to centos so kubelet starts (#504)",
 			expectedPRNumber: 504,
 		},
+		{
+			name: "Get PR number from revert commit",
+			commitMessage: `Revert "some pr (#1000)" (#1234)
+
+
+This reverts commit abcdef1234567890abcdef1234567890abcdef12.`,
+			expectedPRNumber: 1234,
+		},
 	}
 
 	for _, tc := range testCases {