fix 83026 for TP cluster

jianzhangbjz · jianzhangbjz · commit 70af3029a43e · 2026-02-28T16:57:30.000+08:00
diff --git a/openshift/tests-extension/test/qe/specs/olmv1_ce.go b/openshift/tests-extension/test/qe/specs/olmv1_ce.go
@@ -1771,12 +1771,12 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh
 		if err := oc.AsAdmin().WithoutNamespace().Run("patch").Args("clusterextension", "extension-argocd-83026", "-p", "{\"spec\": {\"source\": {\"catalog\": {\"version\": \"v0.5.0\"}}}}", "--type=merge").Execute(); err != nil {
 			e2e.Failf("patch clusterextension failed:%v", err)
 		}
-		ceArgocd.WaitProgressingMessage(oc, "Desired state reached")
+		ceArgocd.CheckClusterExtensionCondition(oc, "Progressing", "reason", "Succeeded", 3, 180, 0)
 		g.By("3)upgrade it to v0.7.0")
 		if err := oc.AsAdmin().WithoutNamespace().Run("patch").Args("clusterextension", "extension-argocd-83026", "-p", "{\"spec\": {\"source\": {\"catalog\": {\"version\": \"v0.7.0\"}}}}", "--type=merge").Execute(); err != nil {
 			e2e.Failf("patch clusterextension failed:%v", err)
 		}
-		ceArgocd.WaitProgressingMessage(oc, "Desired state reached")
+		ceArgocd.CheckClusterExtensionCondition(oc, "Progressing", "reason", "Succeeded", 3, 180, 0)
 	})
 
 	g.It("PolarionID:69196-[OTP][Level0][Skipped:Disconnected]Supports Version Ranges during clusterextension upgrade", func() {

Original file line number	Diff line number	Diff line change
`@@ -1771,12 +1771,12 @@ var _ = g.Describe("[sig-olmv1][Jira:OLM] clusterextension", g.Label("NonHyperSh`
`1771`	`1771`	`if err := oc.AsAdmin().WithoutNamespace().Run("patch").Args("clusterextension", "extension-argocd-83026", "-p", "{\"spec\": {\"source\": {\"catalog\": {\"version\": \"v0.5.0\"}}}}", "--type=merge").Execute(); err != nil {`
`1772`	`1772`	`e2e.Failf("patch clusterextension failed:%v", err)`
`1773`	`1773`	`}`
`1774`		`- ceArgocd.WaitProgressingMessage(oc, "Desired state reached")`
	`1774`	`+ ceArgocd.CheckClusterExtensionCondition(oc, "Progressing", "reason", "Succeeded", 3, 180, 0)`
`1775`	`1775`	`g.By("3)upgrade it to v0.7.0")`
`1776`	`1776`	`if err := oc.AsAdmin().WithoutNamespace().Run("patch").Args("clusterextension", "extension-argocd-83026", "-p", "{\"spec\": {\"source\": {\"catalog\": {\"version\": \"v0.7.0\"}}}}", "--type=merge").Execute(); err != nil {`
`1777`	`1777`	`e2e.Failf("patch clusterextension failed:%v", err)`
`1778`	`1778`	`}`
`1779`		`- ceArgocd.WaitProgressingMessage(oc, "Desired state reached")`
	`1779`	`+ ceArgocd.CheckClusterExtensionCondition(oc, "Progressing", "reason", "Succeeded", 3, 180, 0)`
`1780`	`1780`	`})`
`1781`	`1781`
`1782`	`1782`	`g.It("PolarionID:69196-[OTP][Level0][Skipped:Disconnected]Supports Version Ranges during clusterextension upgrade", func() {`