diff --git a/tests/operator/tests/operator_install_status_no_privileges.go b/tests/operator/tests/operator_install_status_no_privileges.go index 1a418b4ae..d38a12d79 100644 --- a/tests/operator/tests/operator_install_status_no_privileges.go +++ b/tests/operator/tests/operator_install_status_no_privileges.go @@ -74,26 +74,6 @@ var _ = Describe("Operator install-status-no-privileges,", func() { randomNamespace) Expect(err).ToNot(HaveOccurred(), "Operator "+tsparams.OperatorPrefixQuay+ " is not ready") - - // kiali operator has resourceNames under its rules - By("Deploy kiali operator for testing") - err = tshelper.DeployOperatorSubscription( - "kiali", - "kiali", - "alpha", - randomNamespace, - tsparams.CommunityOperatorGroup, - tsparams.OperatorSourceNamespace, - "", - v1alpha1.ApprovalAutomatic, - ) - Expect(err).ToNot(HaveOccurred(), ErrorDeployOperatorStr+ - tsparams.OperatorPrefixKiali) - - err = tshelper.WaitUntilOperatorIsReady(tsparams.OperatorPrefixKiali, - randomNamespace) - Expect(err).ToNot(HaveOccurred(), "Operator "+tsparams.OperatorPrefixKiali+ - " is not ready") }) AfterEach(func() { @@ -155,14 +135,13 @@ var _ = Describe("Operator install-status-no-privileges,", func() { // 66383 It("one operator with clusterPermissions and resourceNames [negative]", func() { - By("Label operator") Eventually(func() error { return tshelper.AddLabelToInstalledCSV( - tsparams.OperatorPrefixKiali, + tsparams.OperatorPrefixCloudbees, randomNamespace, tsparams.OperatorLabel) }, tsparams.TimeoutLabelCsv, tsparams.PollingInterval).Should(Not(HaveOccurred()), - ErrorLabelingOperatorStr+tsparams.OperatorPrefixKiali) + ErrorLabelingOperatorStr+tsparams.OperatorPrefixCloudbees) By("Start test") err := globalhelper.LaunchTests( @@ -215,14 +194,13 @@ var _ = Describe("Operator install-status-no-privileges,", func() { // 66385 It("two operators, one with clusterPermissions and resourceNames", func() { - By("Label operators") Eventually(func() error { return tshelper.AddLabelToInstalledCSV( - tsparams.OperatorPrefixKiali, + tsparams.OperatorPrefixCloudbees, randomNamespace, tsparams.OperatorLabel) }, tsparams.TimeoutLabelCsv, tsparams.PollingInterval).Should(Not(HaveOccurred()), - ErrorLabelingOperatorStr+tsparams.OperatorPrefixKiali) + ErrorLabelingOperatorStr+tsparams.OperatorPrefixCloudbees) Eventually(func() error { return tshelper.AddLabelToInstalledCSV( diff --git a/tests/operator/tests/operator_single_or_multi_namespaced_allowed_in_tenant_namespaces.go b/tests/operator/tests/operator_single_or_multi_namespaced_allowed_in_tenant_namespaces.go index 1e62e5eff..15f334fa0 100644 --- a/tests/operator/tests/operator_single_or_multi_namespaced_allowed_in_tenant_namespaces.go +++ b/tests/operator/tests/operator_single_or_multi_namespaced_allowed_in_tenant_namespaces.go @@ -31,7 +31,6 @@ var _ = Describe("Operator single-or-multi-namespaced-allowed-in-tenant-namespac createTestOperatorGroup(randomTargetingNamespace, tsparams.SingleOrMultiNamespacedOperatorGroup, []string{randomNamespace}) DeferCleanup(func() { - err := globalhelper.DeleteNamespaceAndWait(randomTargetingNamespace, tsparams.Timeout) Expect(err).ToNot(HaveOccurred(), "Error deleting namespace "+randomTargetingNamespace) }) @@ -330,15 +329,14 @@ func createTestOperatorGroup(namespace, operatorGroupName string, targetNamespac Expect(err).ToNot(HaveOccurred(), "Error creating namespace "+namespace) By("Create target namespaces") + for _, targetNamespace := range targetNamespaces { err := globalhelper.CreateNamespace(targetNamespace) - Expect(err).ToNot(HaveOccurred(), "Error creating namespace "+targetNamespace) } DeferCleanup(func() { for _, targetNamespace := range targetNamespaces { - err := globalhelper.DeleteNamespaceAndWait(targetNamespace, tsparams.Timeout) Expect(err).ToNot(HaveOccurred(), "Error deleting namespace "+targetNamespace) } @@ -351,7 +349,7 @@ func createTestOperatorGroup(namespace, operatorGroupName string, targetNamespac func installAndLabelOperator(operatorNamespace string) { By("Query the packagemanifest for the default channel") - channel, err := globalhelper.QueryPackageManifestForDefaultChannel( //nolint:wsl + channel, err := globalhelper.QueryPackageManifestForDefaultChannel( tsparams.CertifiedOperatorPrefixNginx, operatorNamespace, )