From 58d0066a7a01ef3f6f3dbfa8a25b312690c7b463 Mon Sep 17 00:00:00 2001 From: Hongwei Liu Date: Fri, 7 Feb 2025 17:36:35 +0800 Subject: [PATCH] fix(STONEINTG-1125): fix gitlab CS change from pending to pending * fix for commitStatus status change from pending to pending Signed-off-by: Hongwei Liu --- status/reporter_gitlab.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/status/reporter_gitlab.go b/status/reporter_gitlab.go index cb8286760..2715a6f57 100644 --- a/status/reporter_gitlab.go +++ b/status/reporter_gitlab.go @@ -184,9 +184,8 @@ func (r *GitLabReporter) setCommitStatus(report TestReport) error { } existingCommitStatus = r.GetExistingCommitStatus(allCommitStatuses, report.FullName) - // special case, we want to skip updating commit status if the status from running to running, from enque to pending - if existingCommitStatus != nil && (existingCommitStatus.Status == "enqueue" || - existingCommitStatus.Status == string(gitlab.Running)) { + // special case, we want to skip updating commit status if the status from running to running, from pending to pending + if existingCommitStatus != nil && existingCommitStatus.Status == string(glState) { r.logger.Info("Skipping commit status update", "scenario.name", report.ScenarioName, "commitStatus.ID", existingCommitStatus.ID, @@ -201,7 +200,7 @@ func (r *GitLabReporter) setCommitStatus(report TestReport) error { commitStatus, _, err := r.client.Commits.SetCommitStatus(r.sourceProjectID, r.sha, &opt) if err != nil { - return fmt.Errorf("failed to set commit status: %w", err) + return fmt.Errorf("failed to set commit status to %s: %w", string(glState), err) } r.logger.Info("Created gitlab commit status", "scenario.name", report.ScenarioName, "commitStatus.ID", commitStatus.ID, "TargetURL", opt.TargetURL)