Merge pull request kubernetes#523 from timstclair/munger

Tollerate issue URLs in rebuild requests
foxish · Mar 1, 2016 · 56e18b1 · 56e18b1
2 parents ed1fb4e + a37ced3
commit 56e18b1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/mungers/rebuild.go b/mungers/rebuild.go
@@ -34,9 +34,13 @@ type RebuildMunger struct {
 	robots sets.String
 }
 
+const (
+	issueURLRe = "(?:https?://)?github.com/kubernetes/kubernetes/issues/[0-9]+"
+)
+
 var (
 	buildMatcher = regexp.MustCompile("@k8s-bot\\s+(?:e2e\\s+)?(?:unit\\s+)?test\\s+this.*")
-	issueMatcher = regexp.MustCompile("\\s+(?:github\\s+)?(issue|flake)\\:?\\s+#(?:IGNORE|[0-9]+)")
+	issueMatcher = regexp.MustCompile("\\s+(?:github\\s+)?(issue|flake)\\:?\\s+(?:#(?:IGNORE|[0-9]+)|" + issueURLRe + ")")
 )
 
 func init() {

diff --git a/mungers/rebuild_test.go b/mungers/rebuild_test.go
@@ -104,6 +104,18 @@ func TestRebuildMissingIssue(t *testing.T) {
 			value:         "@k8s-bot test this please flake: #12345",
 			expectMissing: false,
 		},
+		{
+			value:         "@k8s-bot test this please flake: https://github.com/kubernetes/kubernetes/issues/12345",
+			expectMissing: false,
+		},
+		{
+			value:         "@k8s-bot test this please flake: https://github.com/kubernetes/kubernetes/issues/12345",
+			expectMissing: false,
+		},
+		{
+			value:         "@k8s-bot test this please flake: github.com/kubernetes/kubernetes/issues/12345",
+			expectMissing: false,
+		},
 	}
 	for _, test := range tests {
 		comment := &githubapi.IssueComment{