From 4c8c69bcdc88379b718edbea5506917f78b80eec Mon Sep 17 00:00:00 2001 From: Moritz Clasmeier Date: Wed, 14 Oct 2026 13:37:28 +0300 Subject: [PATCH 1/2] Workarounds for OLM e2e tests --- tests/e2e/olm_switch_test.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/e2e/olm_switch_test.go b/tests/e2e/olm_switch_test.go index 37821cc..c06ea4e 100644 --- a/tests/e2e/olm_switch_test.go +++ b/tests/e2e/olm_switch_test.go @@ -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 @@ -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 @@ -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 From 020a7f1b07afb8f3fe59c4f1dc0ab1d335c34544 Mon Sep 17 00:00:00 2001 From: Moritz Clasmeier Date: Wed, 14 Oct 2026 13:45:21 +0300 Subject: [PATCH 2/2] (CI trigger)