diff --git a/tests-extension/test/qe/specs/olmv0_nonallns.go b/tests-extension/test/qe/specs/olmv0_nonallns.go index b376cfb4ee..d095a473a6 100644 --- a/tests-extension/test/qe/specs/olmv0_nonallns.go +++ b/tests-extension/test/qe/specs/olmv0_nonallns.go @@ -6577,7 +6577,7 @@ var _ = g.Describe("[sig-operator][Jira:OLM] OLMv0 within a namespace", func() { } o.Expect(err).NotTo(o.HaveOccurred()) } - olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Contain, "10", exutil.Ok, []string{"pods", "-n", "openshift-marketplace", "-l", "olm.catalogSource=redhat-operators", "-o=jsonpath={..spec.containers[0].startupProbe.failureThreshold}"}).Check(oc) + olmv0util.NewCheck("expect", exutil.AsAdmin, exutil.WithoutNamespace, exutil.Contain, "15", exutil.Ok, []string{"pods", "-n", "openshift-marketplace", "-l", "olm.catalogSource=redhat-operators", "-o=jsonpath={..spec.containers[0].startupProbe.failureThreshold}"}).Check(oc) }) g.It("PolarionID:68901-[OTP][Skipped:Disconnected]Packageserver pod should not crash if updateStrategy is incorrect", g.Label("NonHyperShiftHOST"), func() { diff --git a/tests-extension/test/qe/util/olmv0util/helper.go b/tests-extension/test/qe/util/olmv0util/helper.go index 453c53b40b..48edf8e40a 100644 --- a/tests-extension/test/qe/util/olmv0util/helper.go +++ b/tests-extension/test/qe/util/olmv0util/helper.go @@ -304,10 +304,14 @@ func removeResource(oc *exutil.CLI, AsAdmin bool, WithoutNamespace bool, paramet func ClusterPackageExists(oc *exutil.CLI, sub SubscriptionDescription) (bool, error) { msg, err := oc.AsAdmin().WithoutNamespace().Run("get").Args("packagemanifest", sub.OperatorPackage, "-n", sub.CatalogSourceNamespace).Output() - if err != nil || strings.Contains(msg, "not found") { + if err != nil { + // A missing packagemanifest is a legitimate "does not exist" result, not a query error. + if strings.Contains(msg, "NotFound") || strings.Contains(msg, "not found") { + return false, nil + } return false, err } - return true, err + return true, nil } func ClusterPackageExistsInNamespace(oc *exutil.CLI, sub SubscriptionDescription, namespace string) (bool, error) {