Skip to content

Commit 722ae1a

Browse files
fix: update e2e tests to expect Progressing=False on successful rollout
Update ClusterExtension e2e assertions to match the corrected Progressing condition semantics. ClusterObjectSet assertions are unchanged as they use a separate controller. Signed-off-by: Venkatesh Durgam <vdurgam@redhat.com> Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 424e392 commit 722ae1a

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

test/e2e/features/install.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,5 +676,5 @@ Feature: Install ClusterExtension
676676
"""
677677
When ServiceAccount "olm-sa" with needed permissions is available in test namespace
678678
Then ClusterExtension is available
679-
And ClusterExtension reports Progressing as True with Reason Succeeded
679+
And ClusterExtension reports Progressing as False with Reason Succeeded
680680
And ClusterExtension reports Installed as True

test/e2e/features/recover.feature

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
5454
And ClusterExtension reports Progressing as True with Reason Retrying
5555
When ServiceAccount "olm-sa" with needed permissions is available in test namespace
5656
Then ClusterExtension is available
57-
And ClusterExtension reports Progressing as True with Reason Succeeded
57+
And ClusterExtension reports Progressing as False with Reason Succeeded
5858

5959
Scenario: Install ClusterExtension after conflicting resource is removed
6060
Given ServiceAccount "olm-sa" with needed permissions is available in test namespace
@@ -114,7 +114,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
114114
And ClusterExtension reports Installed as False
115115
When resource "deployment/test-operator-${SCENARIO_ID}" is removed
116116
Then ClusterExtension is available
117-
And ClusterExtension reports Progressing as True with Reason Succeeded
117+
And ClusterExtension reports Progressing as False with Reason Succeeded
118118
And ClusterExtension reports Installed as True
119119

120120
@PreflightPermissions
@@ -149,7 +149,7 @@ Feature: Recover cluster extension from errors that might occur during its lifet
149149
"""
150150
When ServiceAccount "olm-sa" with needed permissions is available in test namespace
151151
Then ClusterExtension is available
152-
And ClusterExtension reports Progressing as True with Reason Succeeded
152+
And ClusterExtension reports Progressing as False with Reason Succeeded
153153
And ClusterExtension reports Installed as True
154154

155155
# CATALOG DELETION RESILIENCE SCENARIOS
@@ -250,6 +250,6 @@ Feature: Recover cluster extension from errors that might occur during its lifet
250250
"olm.operatorframework.io/metadata.name": ${CATALOG:test}
251251
"""
252252
And ClusterExtension latest generation has been reconciled
253-
And ClusterExtension reports Progressing as True with Reason Succeeded
253+
And ClusterExtension reports Progressing as False with Reason Succeeded
254254
Then ClusterExtension is available
255255
And ClusterExtension reports Installed as True

test/e2e/steps/steps.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ func ClusterExtensionReconciledLatestGeneration(ctx context.Context) error {
584584
return nil
585585
}
586586

587-
// ClusterExtensionIsRolledOut waits for the ClusterExtension's Progressing condition to be True with reason Succeeded,
587+
// ClusterExtensionIsRolledOut waits for the ClusterExtension's Progressing condition to be False with reason Succeeded,
588588
// then gathers its constituent resources into the scenario context. Polls with timeout.
589589
func ClusterExtensionIsRolledOut(ctx context.Context) error {
590590
sc := scenarioCtx(ctx)
@@ -599,7 +599,7 @@ func ClusterExtensionIsRolledOut(ctx context.Context) error {
599599
return false
600600
}
601601

602-
return condition["status"] == "True" && condition["reason"] == "Succeeded" && condition["type"] == "Progressing"
602+
return condition["status"] == "False" && condition["reason"] == "Succeeded" && condition["type"] == "Progressing"
603603
}, timeout, tick)
604604

605605
if rec := RecorderFromContext(ctx); rec != nil {

0 commit comments

Comments
 (0)