Skip to content

Commit c68be5e

Browse files
committed
test/extended/cli/adm_upgrade/recommend: Handle accepted Upgradeable=False
In 44cd78a (test/extended/cli/adm_upgrade/recommend: Account for Upgradeable=False, 2025-08-05, #30113), I'd updated the regular expression to accept: Reason: MultipleReasons for clusters that had both Upgradeable=False and conditional risks going on. In 7724a75 (test/extended/cli/adm_upgrade/recommend: Trust the ingress CA, 2025-08-14, #30113), I extended the regular expression to cover: Reason: accepted TestRiskA via ConditionalUpdateRisk But I hadn't thought through the MultipleReasons case, and this commit catches us up to tech-preview serial output like [1]: ... Reason: accepted MultipleReasons via ConditionalUpdateRisk Message: Cluster operator config-operator should not be upgraded between minor versions: FeatureGatesUpgradeable: "TechPreviewNoUpgrade" does not allow updates This is a test risk. https://example.com/testRiskA ... [1]: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/30113/pull-ci-openshift-origin-main-e2e-gcp-ovn-techpreview-serial-1of2/1963672599955247104
1 parent de10dfe commit c68be5e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

test/extended/cli/adm_upgrade/recommend.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ Channel: test-channel [(]available channels: other-channel, test-channel[)]
251251
Update to 4[.][0-9]*[.]0 Recommended=False:
252252
Image: example.com/test@sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
253253
Release URL: https://example.com/release/4[.][0-9]*[.]0
254-
Reason: (accepted TestRiskA via ConditionalUpdateRisk|MultipleReasons)
254+
Reason: accepted (TestRiskA|MultipleReasons) via ConditionalUpdateRisk
255255
Message: (?s:.*)This is a test risk[.] https://example.com/testRiskA
256256
Update to 4[.][0-9]*[.]0 has no known issues relevant to this cluster other than the accepted ConditionalUpdateRisk.`)
257257
o.Expect(err).NotTo(o.HaveOccurred())

0 commit comments

Comments
 (0)