Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions tests/e2e/olm_switch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ func TestOLMToNonOLMSwitch(t *testing.T) {

// Step 2: Deploy central again without OLM (should switch modes)
t.Log("=== Step 2: Redeploy central without OLM (triggering mode switch) ===")
args = append([]string{roxieBinary, "deploy", "central", "--envrc", envrcPath}, commonDeployArgs...)
// Note: we need to *explicitly* set OLM because of an pre-existing issue where the on-cluster manifest influences
// the effective deployment configuration on a re-deployment.
args = append([]string{roxieBinary, "deploy", "central", "--olm=false", "--envrc", envrcPath}, commonDeployArgs...)
runCommand(t, deployTimeout, nil, args...)

// Verify operator switched to non-OLM mode
Expand Down Expand Up @@ -104,7 +106,9 @@ func TestNonOLMToOLMSwitch(t *testing.T) {

// Step 1: Deploy central without OLM (non-OLM operator)
t.Log("=== Step 1: Deploy central with non-OLM operator ===")
args := append([]string{roxieBinary, "deploy", "central", "--envrc", envrcPath}, commonDeployArgs...)
// Note: we need to *explicitly* set OLM because of an pre-existing issue where the on-cluster manifest influences
// the effective deployment configuration on a re-deployment.
args := append([]string{roxieBinary, "deploy", "central", "--olm=false", "--envrc", envrcPath}, commonDeployArgs...)
runCommand(t, deployTimeout, nil, args...)

// Verify operator is in non-OLM mode
Expand Down Expand Up @@ -260,9 +264,9 @@ func TestSecuredClusterWithOLMSwitch(t *testing.T) {

// Step 3: Switch to non-OLM by redeploying secured-cluster without --olm
t.Log("=== Step 3: Redeploy secured-cluster without OLM (triggering mode switch) ===")
// Note: we need to *explicitly* disable OLM because of an pre-existing issue where the on-cluster manifest influences
// Note: we need to *explicitly* set OLM because of an pre-existing issue where the on-cluster manifest influences
// the effective deployment configuration on a re-deployment.
args = append([]string{roxieBinary, "deploy", "--early-readiness", "secured-cluster", "--olm=false"}, commonDeployArgs...)
args = append([]string{roxieBinary, "deploy", "--early-readiness", "--olm=false", "secured-cluster"}, commonDeployArgs...)
runCommand(t, deployTimeout, envrcEnv, args...)

// Verify operator switched to non-OLM mode
Expand Down
Loading