Merge pull request #30122 from bitoku/image-volume-default

openshift-merge-bot[bot] · web-flow · commit 0dfa8e53141b · 2025-08-22T07:07:43.000Z
OCPNODE-3004: Run ImageVolume tests in all clusters.
diff --git a/test/extended/node/image_volume.go b/test/extended/node/image_volume.go
@@ -30,9 +30,11 @@ var _ = g.Describe("[sig-node] [FeatureGate:ImageVolume] ImageVolume", func() {
 	)
 
 	g.BeforeEach(func() {
-		// Skip if ImageVolume feature is not enabled
-		if !exutil.IsTechPreviewNoUpgrade(context.TODO(), oc.AdminConfigClient()) {
-			g.Skip("skipping, this feature is only supported on TechPreviewNoUpgrade clusters")
+		// Microshift doesn't inherit OCP feature gates, and ImageVolume won't work either
+		isMicroshift, err := exutil.IsMicroShiftCluster(oc.AdminKubeClient())
+		o.Expect(err).NotTo(o.HaveOccurred())
+		if isMicroshift {
+			g.Skip("Not supported on Microshift")
 		}
 	})
 

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,11 @@ var _ = g.Describe("[sig-node] [FeatureGate:ImageVolume] ImageVolume", func() {`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`g.BeforeEach(func() {`
`33`		`- // Skip if ImageVolume feature is not enabled`
`34`		`- if !exutil.IsTechPreviewNoUpgrade(context.TODO(), oc.AdminConfigClient()) {`
`35`		`- g.Skip("skipping, this feature is only supported on TechPreviewNoUpgrade clusters")`
	`33`	`+ // Microshift doesn't inherit OCP feature gates, and ImageVolume won't work either`
	`34`	`+ isMicroshift, err := exutil.IsMicroShiftCluster(oc.AdminKubeClient())`
	`35`	`+ o.Expect(err).NotTo(o.HaveOccurred())`
	`36`	`+ if isMicroshift {`
	`37`	`+ g.Skip("Not supported on Microshift")`
`36`	`38`	`}`
`37`	`39`	`})`
`38`	`40`