Skip to content

Commit 655034a

Browse files
fix(git-merge-pr): treat merge errors as transient when wait=true
When git-merge-pr is configured with wait:true and the merge API returns an error (e.g. 405 "Required status check is expected"), the step returns Running status instead of Failed+TerminalError so it retries on the next reconciliation. Previously, any error from MergePullRequest was treated as terminal, even when wait was enabled. This caused promotions to fail permanently on the first attempt when CI status checks were still pending. Fixes #6397 Signed-off-by: Arunesh Dwivedi <[email protected]>
1 parent e68672c commit 655034a

2 files changed

Lines changed: 27 additions & 3 deletions

File tree

‎pkg/promotion/runner/builtin/git_pr_merger.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,12 @@ func (g *gitPRMerger) run(
127127
cfg.PRNumber,
128128
&gitprovider.MergePullRequestOpts{MergeMethod: cfg.MergeMethod},
129129
); err != nil {
130-
// Only actual errors (auth, network, invalid PR, closed but not merged,
131-
// etc.) reach here
130+
// When wait is enabled, treat merge errors as transient (e.g. 405
131+
// "Required status check is expected") so the step retries on the
132+
// next reconciliation instead of failing permanently.
133+
if cfg.Wait {
134+
return promotion.StepResult{Status: kargoapi.PromotionStepStatusRunning}, nil
135+
}
132136
return promotion.StepResult{Status: kargoapi.PromotionStepStatusFailed},
133137
&promotion.TerminalError{
134138
Err: fmt.Errorf("error merging pull request %d: %w", cfg.PRNumber, err),

‎pkg/promotion/runner/builtin/git_pr_merger_test.go‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func Test_gitPRMerger_run(t *testing.T) {
113113
assertions func(*testing.T, promotion.StepResult, error)
114114
}{
115115
{
116-
name: "error during merge attempt",
116+
name: "error during merge attempt with wait disabled",
117117
provider: &gitprovider.Fake{
118118
MergePullRequestFn: func(
119119
context.Context,
@@ -133,6 +133,26 @@ func Test_gitPRMerger_run(t *testing.T) {
133133
require.Equal(t, kargoapi.PromotionStepStatusFailed, res.Status)
134134
},
135135
},
136+
{
137+
name: "error during merge attempt with wait enabled returns running",
138+
provider: &gitprovider.Fake{
139+
MergePullRequestFn: func(
140+
context.Context,
141+
int64,
142+
*gitprovider.MergePullRequestOpts,
143+
) (*gitprovider.PullRequest, bool, error) {
144+
return nil, false, errors.New("405 Repository rule violations found: Required status check is expected")
145+
},
146+
},
147+
config: builtin.GitMergePRConfig{
148+
PRNumber: 42,
149+
Wait: true,
150+
},
151+
assertions: func(t *testing.T, res promotion.StepResult, err error) {
152+
require.NoError(t, err)
153+
require.Equal(t, kargoapi.PromotionStepStatusRunning, res.Status)
154+
},
155+
},
136156
{
137157
name: "PR not ready to merge with wait enabled",
138158
provider: &gitprovider.Fake{

0 commit comments

Comments
 (0)