diff --git a/test/integration/packagemanifests_test.go b/test/integration/packagemanifests_test.go index 4dfc44bbd30..3ac7a0e0312 100644 --- a/test/integration/packagemanifests_test.go +++ b/test/integration/packagemanifests_test.go @@ -15,7 +15,6 @@ package integration import ( - "fmt" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" ) @@ -36,14 +35,14 @@ var _ = Describe("run packagemanifests", func() { It("should handle existing operator deployments correctly", func() { output, err = cleanup(&tc) Expect(err).NotTo(HaveOccurred()) - Expect(output).To(ContainSubstring(fmt.Sprintf(`package \"e2e-%s\" not found`, tc.TestSuffix))) + Expect(output).To(ContainSubstring(`package \"memcached-operator\" not found`)) Expect(runPackageManifests(&tc, "--version", "0.0.1")).To(Succeed()) Expect(runPackageManifests(&tc, "--version", "0.0.1")).NotTo(Succeed()) _, err = cleanup(&tc) Expect(err).NotTo(HaveOccurred()) output, err = cleanup(&tc) Expect(err).NotTo(HaveOccurred()) - Expect(output).To(ContainSubstring(fmt.Sprintf(`package \"e2e-%s\" not found`, tc.TestSuffix))) + Expect(output).To(ContainSubstring(`package \"memcached-operator\" not found`)) }) It("should succeed with a single operator version in AllNamespaces mode", func() { diff --git a/test/integration/suite_test.go b/test/integration/suite_test.go index 67092d43263..92a30dc38b8 100644 --- a/test/integration/suite_test.go +++ b/test/integration/suite_test.go @@ -139,7 +139,7 @@ func runPackageManifests(tc *testutils.TestContext, args ...string) error { } func cleanup(tc *testutils.TestContext) (string, error) { - allArgs := []string{"cleanup", fmt.Sprintf("e2e-%s", tc.TestSuffix), "--timeout", "4m", "--namespace", tc.Kubectl.Namespace} + allArgs := []string{"cleanup", tc.ProjectName, "--timeout", "4m", "--namespace", tc.Kubectl.Namespace} output, err := tc.Run(exec.Command(tc.BinaryName, allArgs...)) if err == nil { fmt.Fprintln(GinkgoWriter, string(output)) @@ -178,7 +178,7 @@ func writeCSV(tc *testutils.TestContext, version string, csv *v1alpha1.ClusterSe } func csvPath(tc *testutils.TestContext, version string, isBundle bool) string { - fileName := fmt.Sprintf("e2e-%s.clusterserviceversion.yaml", tc.TestSuffix) + fileName := fmt.Sprintf("%s.clusterserviceversion.yaml", tc.ProjectName) if isBundle { return filepath.Join(tc.Dir, "bundle", bundle.ManifestsDir, fileName) }