From 3fdf55faba04f6f50ebbe9e0391d98cc788c8de6 Mon Sep 17 00:00:00 2001 From: Triona Doyle Date: Mon, 25 May 2026 12:27:11 +0100 Subject: [PATCH 1/2] Update component versions for 1.19 Signed-off-by: Triona Doyle --- .../ginkgo/parallel/1-031_validate_toolchain_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 bf3f5624f77..b856243dc75 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 @@ -85,9 +85,9 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { It("verifies that toolchain versions have the expected values", 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.5" + expected_kustomizeVersion := "v5.7.1" + expected_helmVersion := "v3.18.6" + expected_argocdVersion := "v3.1.16" var expected_dexVersion string var expected_redisVersion string @@ -99,8 +99,8 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { } else { // when running against RC/ released version of gitops - expected_dexVersion = "v2.43.0" - expected_redisVersion = "7.2.10" + expected_dexVersion = "v2.43.1" + expected_redisVersion = "7.2.11" } By("locating pods containing toolchain in openshift-gitops") From 4430e8c083241fd0591eeea71934eccd6f6b199d Mon Sep 17 00:00:00 2001 From: Triona Doyle Date: Tue, 26 May 2026 09:36:31 +0100 Subject: [PATCH 2/2] set specific toolchain versions for CI and RC Signed-off-by: Triona Doyle --- .../parallel/1-031_validate_toolchain_test.go | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) 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 b856243dc75..16a0b2d4212 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 @@ -85,20 +85,25 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() { It("verifies that toolchain versions have the expected values", 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.1" - expected_helmVersion := "v3.18.6" - expected_argocdVersion := "v3.1.16" - + var expected_kustomizeVersion string + var expected_helmVersion string + var expected_argocdVersion string var expected_dexVersion string var expected_redisVersion string if os.Getenv("CI") == "prow" { // when running against openshift-ci + expected_kustomizeVersion = "v5.7.0" + expected_helmVersion = "v3.18.4" + expected_argocdVersion = "v3.1.5" expected_dexVersion = "v2.43.0" expected_redisVersion = "7.2.7" } else { // when running against RC/ released version of gitops + expected_kustomizeVersion = "v5.7.1" + expected_helmVersion = "v3.18.6" + expected_argocdVersion = "v3.1.16" expected_dexVersion = "v2.43.1" expected_redisVersion = "7.2.11" }