fix: Fixing Mergeable issue

gojekfarm · Feb 23, 2024 · 2648f2d · 2648f2d
1 parent d563366
commit 2648f2d
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/server/events/vcs/gitlab_client.go b/server/events/vcs/gitlab_client.go
@@ -310,13 +310,17 @@ func (g *GitlabClient) PullIsMergeable(repo models.Repo, pull models.PullRequest
 		return false, err
 	}
 
-	if ((ok && (mr.DetailedMergeStatus == "mergeable" || mr.DetailedMergeStatus == "ci_still_running")) ||
-		(!ok && mr.MergeStatus == "can_be_merged")) &&
-		mr.ApprovalsBeforeMerge <= 0 &&
-		mr.BlockingDiscussionsResolved &&
-		!mr.WorkInProgress &&
-		(allowSkippedPipeline || !isPipelineSkipped) {
-		return true, nil
+	retryLimit := 3
+	for attempt := 0; attempt < retryLimit; attempt++ {
+		if ((ok && (mr.DetailedMergeStatus == "mergeable" || mr.DetailedMergeStatus == "ci_still_running")) ||
+			(!ok && mr.MergeStatus == "can_be_merged")) &&
+			mr.ApprovalsBeforeMerge <= 0 &&
+			mr.BlockingDiscussionsResolved &&
+			!mr.WorkInProgress &&
+			(allowSkippedPipeline || !isPipelineSkipped) {
+			return true, nil
+		}
+		time.Sleep(10 * time.Second)
 	}
 	return false, nil
 }