Skip to content

OTA-1581: Skip UpgradeStatus test on HyperShift #30132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdodson merged 1 commit into from
Aug 19, 2025
Merged

OTA-1581: Skip UpgradeStatus test on HyperShift #30132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions test/extended/cli/adm_upgrade/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package adm_upgrade

import (
"context"

g "github.com/onsi/ginkgo/v2"
o "github.com/onsi/gomega"
exutil "github.com/openshift/origin/test/extended/util"
Expand All @@ -16,6 +18,15 @@ var _ = g.Describe("[sig-cli][OCPFeatureGate:UpgradeStatus] oc adm upgrade statu
oc := exutil.NewCLIWithoutNamespace("oc-adm-upgrade-status").AsAdmin()

g.It("reports correctly when the cluster is not updating", func() {

// CLI-side oc adm upgrade status does not support HyperShift (assumes MCPs, ignores NodePools, has no knowledge of
// management / hosted cluster separation)
isHyperShift, err := exutil.IsHypershift(context.TODO(), oc.AdminConfigClient())
o.Expect(err).NotTo(o.HaveOccurred())
if isHyperShift {
g.Skip("oc adm upgrade status is not supported on HyperShift")
}

cmd := oc.Run("adm", "upgrade", "status").EnvVar("OC_ENABLE_CMD_UPGRADE_STATUS", "true")
out, err := cmd.Output()
o.Expect(err).NotTo(o.HaveOccurred())
Expand Down