From 63b7baf048f3801f6ec9dc3f5d1ad6e11b591eac Mon Sep 17 00:00:00 2001 From: Tao Li Date: Mon, 19 Feb 2024 10:47:38 +0800 Subject: [PATCH] correct dev catalog name Signed-off-by: Tao Li --- tests/e2e/openshift_upgrade_test.go | 5 +++-- tests/utils/openshift.go | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/e2e/openshift_upgrade_test.go b/tests/e2e/openshift_upgrade_test.go index cb1952fbf7..3aca461b78 100644 --- a/tests/e2e/openshift_upgrade_test.go +++ b/tests/e2e/openshift_upgrade_test.go @@ -17,6 +17,7 @@ package e2e import ( "fmt" + "github.com/blang/semver" "github.com/cloudnative-pg/cloudnative-pg/tests" testsUtils "github.com/cloudnative-pg/cloudnative-pg/tests/utils" @@ -166,9 +167,9 @@ var _ = Describe("Upgrade Paths on OpenShift", Label(tests.LabelUpgrade), Ordere assertClusterIsAligned(namespace, clusterName) } - It(fmt.Sprintf("stable-v1 to alpha, currently version 1.22, ocp version %s", ocpVersion.String()), func() { + It("stable-v1 to alpha, currently version 1.22", func() { if ocpVersion.GT(ocp413) { - Skip("This test runs only on OCP 4.12 or lower") + Skip(fmt.Sprintf("This test runs only on OCP 4.12 or lower, current ocp version is %s", ocpVersion.String())) } DeferCleanup(cleanupOpenshift) applyUpgrade("stable-v1", "alpha") diff --git a/tests/utils/openshift.go b/tests/utils/openshift.go index 16395fc3ce..1e65b79191 100644 --- a/tests/utils/openshift.go +++ b/tests/utils/openshift.go @@ -122,7 +122,7 @@ func CreateSubscription(env *TestingEnvironment, channel string) error { "channel": channel, "installPlanApproval": "Automatic", "name": "cloudnative-pg", - "source": "cloudnative-pg-manifests", + "source": "cloudnative-pg-catalog", "sourceNamespace": "openshift-marketplace", }