Merge pull request #1465 from jenkins-x/tracepr

fix: make /test work with branches
jenkins-x · Nov 15, 2023 · 5ddff2b · 5ddff2b
2 parents 1dc0313 + cd4374c
commit 5ddff2b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/pkg/config/job/presubmit.go b/pkg/config/job/presubmit.go
@@ -48,7 +48,7 @@ type Presubmit struct {
 	JenkinsSpec  *JenkinsSpec `json:"jenkins_spec,omitempty"`
 
 	// We'll set these when we load it.
-	// re *regexp.Regexp // from Trigger.
+	re *regexp.Regexp // from Trigger.
 }
 
 // SetDefaults initializes default values
@@ -91,6 +91,7 @@ func (p *Presubmit) SetRegexes() error {
 
 // ClearCompiledRegexes compiles and validates all the regular expressions
 func (p *Presubmit) ClearCompiledRegexes() {
+	p.re = nil
 	p.Brancher.re = nil
 	p.Brancher.reSkip = nil
 	p.RegexpChangeMatcher.reChanges = nil
@@ -153,12 +154,12 @@ func (p Presubmit) TriggerMatches(body string) bool {
 			return body == p.Trigger
 		}
 	}
-	return p.Trigger != "" && re != nil && re.MatchString(body)
+	return re != nil && re.MatchString(body)
 }
 
 // ContextRequired checks whether a context is required from github points of view (required check).
 func (p Presubmit) ContextRequired() bool {
-	return !p.Optional && !p.SkipReport
+	return !(p.Optional || p.SkipReport)
 }
 
 // Validate validates job base

diff --git a/pkg/jobutil/filter.go b/pkg/jobutil/filter.go
@@ -79,6 +79,7 @@ func FilterPresubmits(filter Filter, changes job.ChangedFilesProvider, branch st
 	for _, presubmit := range presubmits {
 		matches, forced, defaults := filter(presubmit)
 		if !matches {
+			logger.WithField("presubmit", presubmit).Trace("doesn't match command filter")
 			continue
 		}
 		shouldRun, err := presubmit.ShouldRun(branch, changes, forced, defaults)

diff --git a/pkg/plugins/trigger/generic-comment.go b/pkg/plugins/trigger/generic-comment.go
@@ -44,11 +44,12 @@ func handleGenericComment(c Client, trigger *plugins.Trigger, gc scmprovider.Gen
 	if commentAuthor == botName {
 		c.Logger.Warn("Comment is made by the bot, for production installs it is recommended to use a different bot user account that your personal one")
 	}
-
+	c.Logger.WithField("event", gc).Trace("Generic comment event")
 	pr, err := c.SCMProviderClient.GetPullRequest(org, repo, number)
 	if err != nil {
 		return err
 	}
+	c.Logger.WithField("pull_request", pr).Trace("Fetched pull request")
 
 	// Skip untrusted users comments.
 	trusted, err := TrustedUser(c.SCMProviderClient, trigger, commentAuthor, org, repo)

diff --git a/pkg/plugins/trigger/generic-comment_test.go b/pkg/plugins/trigger/generic-comment_test.go
@@ -546,7 +546,6 @@ func TestHandleGenericComment(t *testing.T) {
 			AddedLabels:   issueLabels(labels.OkToTest),
 			RemovedLabels: issueLabels(labels.NeedsOkToTest),
 		},
-		/* TODO
 		{
 			name:   "/test of branch-sharded job",
 			Author: "trusted-member",
@@ -557,7 +556,7 @@ func TestHandleGenericComment(t *testing.T) {
 				"org/repo": {
 					{
 						Base: job.Base{
-							Name: "jab",
+							Name: "master-jab",
 						},
 						Brancher: job.Brancher{Branches: []string{"master"}},
 						Reporter: job.Reporter{
@@ -568,7 +567,7 @@ func TestHandleGenericComment(t *testing.T) {
 					},
 					{
 						Base: job.Base{
-							Name: "jab",
+							Name: "release-jab",
 						},
 						Brancher: job.Brancher{Branches: []string{"release"}},
 						Reporter: job.Reporter{
@@ -617,7 +616,6 @@ func TestHandleGenericComment(t *testing.T) {
 			},
 			ShouldReport: true,
 		},
-		*/
 		{
 			name:   "branch-sharded job. no shard matches base branch. Skipped statuses elided.",
 			Author: "trusted-member",