Merge pull request #30988 from xueqzhan/oc-adm-empty-channel

openshift-merge-bot[bot] · web-flow · commit ea97fb6e3d68 · 2026-04-22T19:21:23.000Z
OCPBUGS-82304: Add sleep to give cvo time to reconcile
diff --git a/test/extended/cli/adm_upgrade/recommend.go b/test/extended/cli/adm_upgrade/recommend.go
@@ -71,6 +71,8 @@ var _ = g.Describe("[Serial][sig-cli] oc adm upgrade recommend", g.Ordered, func
 		}
 		restoreChannel = true
 
+		time.Sleep(16 * time.Second) // Give the CVO time to reconcile the empty channel and push to status
+
 		out, err := oc.Run("adm", "upgrade", "recommend").EnvVar("OC_ENABLE_CMD_UPGRADE_RECOMMEND", "true").EnvVar("OC_ENABLE_CMD_UPGRADE_RECOMMEND_PRECHECK", "true").EnvVar("OC_ENABLE_CMD_UPGRADE_RECOMMEND_ACCEPT", "true").Output()
 		o.Expect(err).NotTo(o.HaveOccurred())
 		err = matchRegexp(out, `.*The update channel has not been configured.*`)

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,8 @@ var _ = g.Describe("[Serial][sig-cli] oc adm upgrade recommend", g.Ordered, func`
`71`	`71`	`}`
`72`	`72`	`restoreChannel = true`
`73`	`73`
	`74`	`+ time.Sleep(16 * time.Second) // Give the CVO time to reconcile the empty channel and push to status`
	`75`	`+`
`74`	`76`	`out, err := oc.Run("adm", "upgrade", "recommend").EnvVar("OC_ENABLE_CMD_UPGRADE_RECOMMEND", "true").EnvVar("OC_ENABLE_CMD_UPGRADE_RECOMMEND_PRECHECK", "true").EnvVar("OC_ENABLE_CMD_UPGRADE_RECOMMEND_ACCEPT", "true").Output()`
`75`	`77`	`o.Expect(err).NotTo(o.HaveOccurred())`
`76`	`78`	err = matchRegexp(out, `.The update channel has not been configured.`)