skip NoRegistryClusterInstall feature tests if InternalReleaseImage resource was not present

andfasano · andfasano · commit 1907014473e7 · 2026-04-02T08:30:29.000-04:00
diff --git a/test/extended/internalreleaseimage/helper.go b/test/extended/internalreleaseimage/helper.go
@@ -262,4 +262,13 @@ func skipIfNoRegistryFeatureUnsupported(oc *exutil.CLI) {
 	if !featureEnabled {
 		g.Skip("NoRegistryClusterInstall feature gate is not enabled")
 	}
+
+	// Check if InternalReleaseImage resource is present. If not present, the feature is not enabled.
+	_, err = oc.MachineConfigurationClient().MachineconfigurationV1alpha1().InternalReleaseImages().Get(context.Background(), IRIResourceName, metav1.GetOptions{})
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			g.Skip("InternalReleaseImage resource not found, feature not enabled")
+		}
+		g.Skip(fmt.Sprintf("error while checking for InternalReleaseImage availability: %v", err))
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -262,4 +262,13 @@ func skipIfNoRegistryFeatureUnsupported(oc *exutil.CLI) {`
`262`	`262`	`if !featureEnabled {`
`263`	`263`	`g.Skip("NoRegistryClusterInstall feature gate is not enabled")`
`264`	`264`	`}`
	`265`	`+`
	`266`	`+ // Check if InternalReleaseImage resource is present. If not present, the feature is not enabled.`
	`267`	`+ _, err = oc.MachineConfigurationClient().MachineconfigurationV1alpha1().InternalReleaseImages().Get(context.Background(), IRIResourceName, metav1.GetOptions{})`
	`268`	`+ if err != nil {`
	`269`	`+ if apierrors.IsNotFound(err) {`
	`270`	`+ g.Skip("InternalReleaseImage resource not found, feature not enabled")`
	`271`	`+ }`
	`272`	`+ g.Skip(fmt.Sprintf("error while checking for InternalReleaseImage availability: %v", err))`
	`273`	`+ }`
`265`	`274`	`}`