Revert "OCPBUGS-24531: Revert "Merge pull request #1007 from candita/…

…OCPBUGS-24531-SkipScopeChangeTest" and add changes to skip test only for Azure and GCP"
openshift · Dec 20, 2023 · bf0ee53 · bf0ee53
1 parent b27c81f
commit bf0ee53
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 27 deletions.
diff --git a/test/e2e/operator_test.go b/test/e2e/operator_test.go
@@ -1435,18 +1435,20 @@ func TestAWSLBTypeDefaulting(t *testing.T) {
 // should delete and recreate the service automatically.
 func TestScopeChange(t *testing.T) {
 	t.Parallel()
+
+	t.Skip("test skipped until resolution in hand for https://issues.redhat.com/browse/OCPBUGS-24044")
+
 	if infraConfig.Status.PlatformStatus == nil {
 		t.Skip("test skipped on nil platform")
 	}
 	platform := infraConfig.Status.PlatformStatus.Type
 	supportedPlatforms := map[configv1.PlatformType]struct{}{
 		configv1.AlibabaCloudPlatformType: {},
 		configv1.AWSPlatformType:          {},
-		// Test skipped on Azure/GCP until resolution in hand for https://issues.redhat.com/browse/OCPBUGS-24044
-		//configv1.AzurePlatformType:        {},
-		//configv1.GCPPlatformType:          {},
-		configv1.IBMCloudPlatformType: {},
-		configv1.PowerVSPlatformType:  {},
+		configv1.AzurePlatformType:        {},
+		configv1.GCPPlatformType:          {},
+		configv1.IBMCloudPlatformType:     {},
+		configv1.PowerVSPlatformType:      {},
 	}
 	if _, supported := supportedPlatforms[platform]; !supported {
 		t.Skipf("test skipped on platform %q", platform)

diff --git a/test/e2e/unmanaged_dns_test.go b/test/e2e/unmanaged_dns_test.go
@@ -108,23 +108,7 @@ func TestUnmanagedDNSToManagedDNSIngressController(t *testing.T) {
 func TestManagedDNSToUnmanagedDNSIngressController(t *testing.T) {
 	t.Parallel()
 
-	if infraConfig.Status.PlatformStatus == nil {
-		t.Skip("test skipped on nil platform")
-	}
-	platform := infraConfig.Status.PlatformStatus.Type
-
-	supportedPlatforms := map[configv1.PlatformType]struct{}{
-		configv1.AlibabaCloudPlatformType: {},
-		configv1.AWSPlatformType:          {},
-		// Test skipped on Azure/GCP until resolution in hand for https://issues.redhat.com/browse/OCPBUGS-24044
-		//configv1.AzurePlatformType:    {},
-		//configv1.GCPPlatformType:      {},
-		configv1.IBMCloudPlatformType: {},
-		configv1.PowerVSPlatformType:  {},
-	}
-	if _, supported := supportedPlatforms[platform]; !supported {
-		t.Skipf("test skipped on platform %q", platform)
-	}
+	t.Skip("test skipped until resolution in hand for https://issues.redhat.com/browse/OCPBUGS-24044")
 
 	name := types.NamespacedName{Namespace: operatorNamespace, Name: "managed-migrated"}
 	ic := newLoadBalancerController(name, name.Name+"."+dnsConfig.Spec.BaseDomain)
@@ -210,6 +194,8 @@ func TestManagedDNSToUnmanagedDNSIngressController(t *testing.T) {
 func TestUnmanagedDNSToManagedDNSInternalIngressController(t *testing.T) {
 	t.Parallel()
 
+	t.Skip("test skipped until resolution in hand for https://issues.redhat.com/browse/OCPBUGS-24044")
+
 	if infraConfig.Status.PlatformStatus == nil {
 		t.Skip("test skipped on nil platform")
 	}
@@ -218,11 +204,10 @@ func TestUnmanagedDNSToManagedDNSInternalIngressController(t *testing.T) {
 	supportedPlatforms := map[configv1.PlatformType]struct{}{
 		configv1.AlibabaCloudPlatformType: {},
 		configv1.AWSPlatformType:          {},
-		// Test skipped on Azure/GCP until resolution in hand for https://issues.redhat.com/browse/OCPBUGS-24044
-		//configv1.AzurePlatformType:    {},
-		//configv1.GCPPlatformType:      {},
-		configv1.IBMCloudPlatformType: {},
-		configv1.PowerVSPlatformType:  {},
+		configv1.AzurePlatformType:        {},
+		configv1.GCPPlatformType:          {},
+		configv1.IBMCloudPlatformType:     {},
+		configv1.PowerVSPlatformType:      {},
 	}
 	if _, supported := supportedPlatforms[platform]; !supported {
 		t.Skipf("test skipped on platform %q", platform)