Skip to content

Commit eddadef

Browse files
committed
Removed SNO check and TPNU checks
1 parent d2012bf commit eddadef

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

test/extended/images/distruptiveimportmode.go

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,6 @@ func changeImportModeAndWaitForApiServer(ctx context.Context, t g.GinkgoTInterfa
5959

6060
func TestImageConfigImageStreamImportModeLegacy(t g.GinkgoTInterface, oc *exutil.CLI) {
6161
ctx := context.Background()
62-
if !exutil.IsTechPreviewNoUpgrade(ctx, oc.AdminConfigClient()) {
63-
g.Skip("skipping, this feature is only supported on TechPreviewNoUpgrade clusters")
64-
}
65-
if isSNO, err := exutil.IsSingleNode(ctx, oc.AdminConfigClient()); err == nil && isSNO {
66-
g.Skip("skipping this test for SNO as it involves an openshift-apiserver disruption")
67-
}
6862

6963
clusterAdminConfigClient := oc.AdminConfigClient().ConfigV1()
7064
imageConfig, err := clusterAdminConfigClient.Images().Get(ctx, "cluster", metav1.GetOptions{})
@@ -111,13 +105,7 @@ func TestImageConfigImageStreamImportModeLegacy(t g.GinkgoTInterface, oc *exutil
111105
}
112106

113107
func TestImageConfigImageStreamImportModePreserveOriginal(t g.GinkgoTInterface, oc *exutil.CLI) {
114-
ctx := context.Background()
115-
if !exutil.IsTechPreviewNoUpgrade(ctx, oc.AdminConfigClient()) {
116-
g.Skip("skipping, this feature is only supported on TechPreviewNoUpgrade clusters")
117-
}
118-
if isSNO, err := exutil.IsSingleNode(ctx, oc.AdminConfigClient()); err == nil && isSNO {
119-
g.Skip("skipping this test for SNO as it involves an openshift-apiserver disruption")
120-
}
108+
ctx := context.Background()
121109

122110
clusterAdminConfigClient := oc.AdminConfigClient().ConfigV1()
123111
imageConfig, err := clusterAdminConfigClient.Images().Get(ctx, "cluster", metav1.GetOptions{})

test/extended/images/tagimportmode.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ var _ = g.Describe("[sig-imageregistry][OCPFeatureGate:ImageStreamImportMode][Se
2626

2727
func TestImageStreamImportMode(t g.GinkgoTInterface, oc *exutil.CLI) {
2828
ctx := context.Background()
29-
if !exutil.IsTechPreviewNoUpgrade(ctx, oc.AdminConfigClient()) {
30-
g.Skip("skipping, this feature is only supported on TechPreviewNoUpgrade clusters")
31-
}
3229

3330
// Check desired.Architecture in the CV
3431
configClient, err := configclient.NewForConfig(oc.AdminConfig())

0 commit comments

Comments
 (0)