Backport fixes for 0.33.x

Fixes from some of the incompatibilities when doing the backport from
main to 0.33.x release

Signed-off-by: Chmouel Boudjnah <[email protected]>

Author: chmouel

.tekton/boussole.yaml

@@ -23,29 +23,5 @@ spec:
       value: "{{ git_auth_secret }}"
     - name: comment_sender
       value: "{{ sender }}"
-    #
-    # Optional parameters (value is the default):
-    #
-    # The key in git_auth_secret that contains the token (default: git-provider-token)
-    # - name: git_auth_secret_key
-    #   value: git-provider-token
-    #
-    # The /lgtm threshold needed of approvers for a PR to be approved (default: 1)
-    # - name: lgtm_threshold
-    #   value: "1"
-    #
-    # The permissionms the user need to trigger a lgtm
-    # - name: lgtm_permissions
-    #   value: "admin,write"
-    #
-    # The review event  when lgtm is triggered, can be APPROVE,
-    # REQUEST_CHANGES, or COMMENT if setting to empty string it will be set as
-    # PENDING
-    # - name: lgtm_review_event
-    #   value: "APPROVE"
-    #
-    # The merge method to use. Can be one of: merge, squash, rebase
-    # - name: merge_method
-    #   value: "rebase"
   pipelineRef:
     name: boussole

test/github_pullrequest_retest_test.go

@@ -86,54 +86,14 @@ func TestGithubPullRequestGitOpsComments(t *testing.T) {
 			prNum:   4,
 		},
 	}
-	assert.NilError(t, err)
-	err = twait.UntilPipelineRunCreated(ctx, g.Cnx.Clients, waitOpts)
-	assert.NilError(t, err)
-
-	g.Cnx.Clients.Log.Infof("/cancel pr-gitops-comment on Pull Request")
-	_, _, err = g.Provider.Client.Issues.CreateComment(ctx,
-		g.Options.Organization,
-		g.Options.Repo, g.PRNumber,
-		&github.IssueComment{Body: github.Ptr("/cancel pr-gitops-comment")})
-	assert.NilError(t, err)
-
-	waitOpts = twait.Opts{
-		RepoName:        g.TargetNamespace,
-		Namespace:       g.TargetNamespace,
-		MinNumberStatus: 3,
-		PollTimeout:     twait.DefaultTimeout,
-		TargetSHA:       g.SHA,
-	}
-	g.Cnx.Clients.Log.Info("Waiting for Repository to be updated")
-	_, err = twait.UntilRepositoryUpdated(ctx, g.Cnx.Clients, waitOpts)
-	assert.NilError(t, err)
-
-	g.Cnx.Clients.Log.Infof("Check if we have the repository set as succeeded")
-	repo, err := g.Cnx.Clients.PipelineAsCode.PipelinesascodeV1alpha1().Repositories(g.TargetNamespace).Get(ctx, g.TargetNamespace, metav1.GetOptions{})
-	assert.NilError(t, err)
-	assert.Equal(t, repo.Status[len(repo.Status)-1].Conditions[0].Status, corev1.ConditionFalse)
-
-	pruns, err = g.Cnx.Clients.Tekton.TektonV1().PipelineRuns(g.TargetNamespace).List(ctx, metav1.ListOptions{
-		LabelSelector: fmt.Sprintf("%s=%s", keys.SHA, g.SHA),
-	})
-	assert.NilError(t, err)
-	assert.Equal(t, len(pruns.Items), 3)
-
-	// go over all pruns check that at least one is canceled and the other two are succeeded
-	canceledCount := 0
-	succeededCount := 0
-	unknownCount := 0
-	for _, prun := range pruns.Items {
-		for _, condition := range prun.Status.Conditions {
-			if condition.Type == "Succeeded" {
-				switch condition.Status {
-				case corev1.ConditionFalse:
-					canceledCount++
-				case corev1.ConditionTrue:
-					succeededCount++
-				case corev1.ConditionUnknown:
-					unknownCount++
-				}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			waitOpts := twait.Opts{
+				RepoName:        g.TargetNamespace,
+				Namespace:       g.TargetNamespace,
+				MinNumberStatus: tt.prNum,
+				PollTimeout:     twait.DefaultTimeout,
+				TargetSHA:       g.SHA,
 			}
 			if tt.comment == "/cancel pr-gitops-comment" {
 				g.Cnx.Clients.Log.Info("/test pr-gitops-comment on Pull Request before canceling")
@@ -172,7 +132,4 @@ func TestGithubPullRequestGitOpsComments(t *testing.T) {
 			assert.Equal(t, len(pruns.Items), tt.prNum)
 		})
 	}
-	assert.Equal(t, canceledCount, 1, "should have one canceled PipelineRun")
-	assert.Equal(t, succeededCount, 2, "should have two succeeded PipelineRuns")
-	assert.Equal(t, unknownCount, 0, "should have zero unknown PipelineRuns: %+v", pruns.Items)
 }

test/gitlab_merge_request_test.go

@@ -335,17 +335,15 @@ func TestGitlabCancelInProgressOnPRClose(t *testing.T) {
 	})
 	assert.NilError(t, err)
 
-	err = twait.UntilPipelineRunHasReason(ctx, runcnx.Clients, v1.PipelineRunReasonCancelled, waitOpts)
-	assert.NilError(t, err)
+	runcnx.Clients.Log.Infof("Sleeping for 10 seconds to let the pipelinerun to be canceled")
+	time.Sleep(10 * time.Second)
 
 	prs, err := runcnx.Clients.Tekton.TektonV1().PipelineRuns(targetNS).List(context.Background(), metav1.ListOptions{})
 	assert.NilError(t, err)
 	assert.Equal(t, len(prs.Items), 1, "should have only one pipelinerun, but we have: %d", len(prs.Items))
 	assert.Equal(t, prs.Items[0].GetStatusCondition().GetCondition(apis.ConditionSucceeded).GetReason(), "Cancelled", "should have been canceled")
 
-	// failing on `true` condition because for cancelled PipelineRun we want `false` condition.
-	waitOpts.FailOnRepoCondition = corev1.ConditionTrue
-	repo, err := twait.UntilRepositoryUpdated(ctx, runcnx.Clients, waitOpts)
+	repo, err := runcnx.Clients.PipelineAsCode.PipelinesascodeV1alpha1().Repositories(targetNS).Get(ctx, targetNS, metav1.GetOptions{})
 	assert.NilError(t, err)
 
 	laststatus := repo.Status[len(repo.Status)-1]