Merge pull request #679 from sm43/test-in-gitlab

Author: chmouel

pkg/provider/bitbucketcloud/events.go

@@ -131,12 +131,17 @@ func (v *Provider) ParsePayload(ctx context.Context, run *params.Run, request *h
 			processedEvent.TriggerTarget = "pull_request"
 			processedEvent.EventType = "pull_request"
 		} else if provider.Valid(event, []string{"pullrequest:comment_created"}) {
-			if provider.IsRetestComment(e.Comment.Content.Raw) {
+			switch {
+			case provider.IsRetestComment(e.Comment.Content.Raw):
 				processedEvent.TriggerTarget = "pull_request"
 				processedEvent.EventType = "retest-comment"
-			} else if provider.IsOkToTestComment(e.Comment.Content.Raw) {
+			case provider.IsOkToTestComment(e.Comment.Content.Raw):
 				processedEvent.TriggerTarget = "pull_request"
 				processedEvent.EventType = "ok-to-test-comment"
+			case provider.IsTestComment(e.Comment.Content.Raw):
+				processedEvent.TriggerTarget = "pull_request"
+				processedEvent.EventType = "test-comment"
+				processedEvent.TargetTestPipelineRun = provider.GetPipelineRunFromComment(e.Comment.Content.Raw)
 			}
 		}
 		processedEvent.Organization = e.Repository.Workspace.Slug
@@ -203,6 +208,9 @@ func (v *Provider) Detect(reqHeader *http.Header, payload string, logger *zap.Su
 			if provider.IsOkToTestComment(e.Comment.Content.Raw) {
 				return setLoggerAndProceed(true, "", nil)
 			}
+			if provider.IsTestComment(e.Comment.Content.Raw) {
+				return setLoggerAndProceed(true, "", nil)
+			}
 		}
 		return setLoggerAndProceed(false, fmt.Sprintf("not a valid gitops comment: \"%s\"", event), nil)
 

pkg/provider/bitbucketserver/events.go

@@ -52,12 +52,17 @@ func (v *Provider) ParsePayload(_ context.Context, _ *params.Run, request *http.
 			processedEvent.TriggerTarget = "pull_request"
 			processedEvent.EventType = "pull_request"
 		} else if provider.Valid(eventType, []string{"pr:comment:added", "pr:comment:edited"}) {
-			if provider.IsRetestComment(e.Comment.Text) {
+			switch {
+			case provider.IsRetestComment(e.Comment.Text):
 				processedEvent.TriggerTarget = "pull_request"
 				processedEvent.EventType = "retest-comment"
-			} else if provider.IsOkToTestComment(e.Comment.Text) {
+			case provider.IsOkToTestComment(e.Comment.Text):
 				processedEvent.TriggerTarget = "pull_request"
 				processedEvent.EventType = "ok-to-test-comment"
+			case provider.IsTestComment(e.Comment.Text):
+				processedEvent.TriggerTarget = "pull_request"
+				processedEvent.EventType = "test-comment"
+				processedEvent.TargetTestPipelineRun = provider.GetPipelineRunFromComment(e.Comment.Text)
 			}
 		}
 		// TODO: It's Really not an OWNER but a PROJECT
@@ -181,6 +186,9 @@ func (v *Provider) Detect(reqHeader *http.Header, payload string, logger *zap.Su
 			if provider.IsOkToTestComment(e.Comment.Text) {
 				return setLoggerAndProceed(true, "", nil)
 			}
+			if provider.IsTestComment(e.Comment.Text) {
+				return setLoggerAndProceed(true, "", nil)
+			}
 		}
 		return setLoggerAndProceed(false, fmt.Sprintf("not a recognized bitbucket event: \"%s\"", event), nil)
 

pkg/provider/gitlab/gitlab.go

@@ -105,6 +105,9 @@ func (v *Provider) Detect(reqHeader *http.Header, payload string, logger *zap.Su
 			if provider.IsOkToTestComment(gitEvent.ObjectAttributes.Note) {
 				return setLoggerAndProceed(true, "", nil)
 			}
+			if provider.IsTestComment(gitEvent.ObjectAttributes.Note) {
+				return setLoggerAndProceed(true, "", nil)
+			}
 		}
 		return setLoggerAndProceed(false, "not a gitops style merge comment event", nil)
 	default:
@@ -195,6 +198,10 @@ func (v *Provider) ParsePayload(_ context.Context, _ *params.Run, request *http.
 		processedEvent.SHATitle = gitEvent.MergeRequest.LastCommit.Message
 		processedEvent.BaseBranch = gitEvent.MergeRequest.TargetBranch
 		processedEvent.HeadBranch = gitEvent.MergeRequest.SourceBranch
+		// if it is a /test comment figure out the pipelineRun name
+		if provider.IsTestComment(gitEvent.ObjectAttributes.Note) {
+			processedEvent.TargetTestPipelineRun = provider.GetPipelineRunFromComment(gitEvent.ObjectAttributes.Note)
+		}
 
 		v.pathWithNamespace = gitEvent.Project.PathWithNamespace
 		processedEvent.Organization, processedEvent.Repository = getOrgRepo(v.pathWithNamespace)