Disable openshift tests and revert hashicorp#1008 (hashicorp#1014)

geobeau · Jun 29, 2021 · 5dd266d · 5dd266d
1 parent 3d971d2
commit 5dd266d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -682,9 +682,9 @@ workflows:
     jobs:
       - cleanup-gcp-resources
       - cleanup-azure-resources
-      - acceptance-openshift:
-          requires:
-          - cleanup-azure-resources
+#      - acceptance-openshift: <-- Disabled until we can make them less flakey.
+#          requires:
+#          - cleanup-azure-resources
       - acceptance-gke-1-17:
           requires:
             - cleanup-gcp-resources

diff --git a/test/terraform/openshift/main.tf b/test/terraform/openshift/main.tf
@@ -46,7 +46,7 @@ resource "azurerm_subnet" "master-subnet" {
   resource_group_name                           = azurerm_resource_group.test[count.index].name
   virtual_network_name                          = azurerm_virtual_network.test[count.index].name
   address_prefixes                              = ["10.0.0.0/23"]
-  enforce_private_link_service_network_policies = false
+  enforce_private_link_service_network_policies = true
   service_endpoints                             = ["Microsoft.ContainerRegistry"]
 }