From eafd31dfdec62d4b648235e42c7ac0fbce39f58d Mon Sep 17 00:00:00 2001 From: Varsha B Date: Wed, 18 Feb 2026 11:41:04 +0530 Subject: [PATCH 1/2] modify tests for interop Signed-off-by: Varsha B --- test/openshift/e2e/ginkgo/fixture/fixture.go | 6 ++++++ .../e2e/ginkgo/parallel/1-031_validate_toolchain_test.go | 4 ++-- .../parallel/1-077_validate_disable_dex_removed_test.go | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/test/openshift/e2e/ginkgo/fixture/fixture.go b/test/openshift/e2e/ginkgo/fixture/fixture.go index dbd78ce55..614fb7c24 100644 --- a/test/openshift/e2e/ginkgo/fixture/fixture.go +++ b/test/openshift/e2e/ginkgo/fixture/fixture.go @@ -360,6 +360,12 @@ func EnvLocalRun() bool { return exists } +// EnvInterop checks if INTEROP env var is set; this variable is set when testing Interoperability of GitOps Operator and OCP +func EnvInterop() bool { + _, exists := os.LookupEnv("INTEROP") + return exists +} + // EnvCI checks if CI env var is set; this variable is set when testing on GitOps Operator running via CI pipeline (and using an OLM Subscription) func EnvCI() bool { _, exists := os.LookupEnv("CI") diff --git a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go index 5bad8fdd8..b2ff68119 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-031_validate_toolchain_test.go @@ -87,7 +87,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { // These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix expected_kustomizeVersion := "v5.7.0" expected_helmVersion := "v3.18.4" - expected_argocdVersion := "v3.1.9" + expected_argocdVersion := "v3.1.11" var expected_dexVersion string var expected_redisVersion string @@ -99,7 +99,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { } else { // when running against RC/ released version of gitops - expected_dexVersion = "v2.41.1" + expected_dexVersion = "v2.43.1" expected_redisVersion = "7.2.11" } diff --git a/test/openshift/e2e/ginkgo/parallel/1-077_validate_disable_dex_removed_test.go b/test/openshift/e2e/ginkgo/parallel/1-077_validate_disable_dex_removed_test.go index 9ed8dbcb7..d9cf4fa16 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-077_validate_disable_dex_removed_test.go +++ b/test/openshift/e2e/ginkgo/parallel/1-077_validate_disable_dex_removed_test.go @@ -57,7 +57,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { By("getting the Subscription and CSV that was used to install the operator") - if fixture.EnvCI() { + if fixture.EnvCI() && !fixture.EnvInterop() { subscription, err := fixture.GetSubscriptionInEnvCIEnvironment(k8sClient) Expect(err).ToNot(HaveOccurred()) Expect(subscription).ToNot(BeNil()) From 5e03a7a3d6101c77823f447762ba129991443815 Mon Sep 17 00:00:00 2001 From: Varsha B Date: Wed, 18 Feb 2026 12:43:19 +0530 Subject: [PATCH 2/2] move the test to sequential Signed-off-by: Varsha B --- test/openshift/e2e/ginkgo/fixture/fixture.go | 6 ------ .../1-077_validate_disable_dex_removed_test.go | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) rename test/openshift/e2e/ginkgo/{parallel => sequential}/1-077_validate_disable_dex_removed_test.go (95%) diff --git a/test/openshift/e2e/ginkgo/fixture/fixture.go b/test/openshift/e2e/ginkgo/fixture/fixture.go index 614fb7c24..dbd78ce55 100644 --- a/test/openshift/e2e/ginkgo/fixture/fixture.go +++ b/test/openshift/e2e/ginkgo/fixture/fixture.go @@ -360,12 +360,6 @@ func EnvLocalRun() bool { return exists } -// EnvInterop checks if INTEROP env var is set; this variable is set when testing Interoperability of GitOps Operator and OCP -func EnvInterop() bool { - _, exists := os.LookupEnv("INTEROP") - return exists -} - // EnvCI checks if CI env var is set; this variable is set when testing on GitOps Operator running via CI pipeline (and using an OLM Subscription) func EnvCI() bool { _, exists := os.LookupEnv("CI") diff --git a/test/openshift/e2e/ginkgo/parallel/1-077_validate_disable_dex_removed_test.go b/test/openshift/e2e/ginkgo/sequential/1-077_validate_disable_dex_removed_test.go similarity index 95% rename from test/openshift/e2e/ginkgo/parallel/1-077_validate_disable_dex_removed_test.go rename to test/openshift/e2e/ginkgo/sequential/1-077_validate_disable_dex_removed_test.go index d9cf4fa16..cdb96a287 100644 --- a/test/openshift/e2e/ginkgo/parallel/1-077_validate_disable_dex_removed_test.go +++ b/test/openshift/e2e/ginkgo/sequential/1-077_validate_disable_dex_removed_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package parallel +package sequential import ( "context" @@ -30,7 +30,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ) -var _ = Describe("GitOps Operator Parallel E2E Tests", func() { +var _ = Describe("GitOps Operator Sequential E2E Tests", func() { Context("1-077_validate_disable_dex_removed", func() { @@ -57,7 +57,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { By("getting the Subscription and CSV that was used to install the operator") - if fixture.EnvCI() && !fixture.EnvInterop() { + if fixture.EnvCI() { subscription, err := fixture.GetSubscriptionInEnvCIEnvironment(k8sClient) Expect(err).ToNot(HaveOccurred()) Expect(subscription).ToNot(BeNil())