chore: integration test fixes (#1301)

terraform-google-modules · Jun 22, 2022 · 3df745d · 3df745d
1 parent 19f59c4
commit 3df745d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/modules/acm/creds.tf b/modules/acm/creds.tf
@@ -25,7 +25,7 @@ resource "time_sleep" "wait_acm" {
   count      = (var.create_ssh_key == true || var.ssh_auth_key != null) ? 1 : 0
   depends_on = [google_gke_hub_feature_membership.main]
 
-  create_duration = "30s"
+  create_duration = "60s"
 }
 
 resource "kubernetes_secret_v1" "creds" {

diff --git a/test/integration/simple_autopilot_public/controls/gcloud.rb b/test/integration/simple_autopilot_public/controls/gcloud.rb
@@ -32,7 +32,7 @@
 
     describe "cluster" do
       it "is running" do
-        expect(data['status']).to eq 'RUNNING'
+        expect(data['status']).to eq('RUNNING').or eq('RECONCILING')
       end
 
       it "is autopilot" do

diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -53,6 +53,8 @@ module "gke-project-1" {
   org_id            = var.org_id
   folder_id         = var.folder_id
   billing_account   = var.billing_account
+  # due to https://github.com/hashicorp/terraform-provider-google/issues/9505 for AP
+  default_service_account = "keep"
 
   auto_create_network = true
 
@@ -74,6 +76,8 @@ module "gke-project-2" {
   org_id            = var.org_id
   folder_id         = var.folder_id
   billing_account   = var.billing_account
+  # due to https://github.com/hashicorp/terraform-provider-google/issues/9505 for AP
+  default_service_account = "keep"
 
   activate_apis = local.apis
   activate_api_identities = [
@@ -94,6 +98,8 @@ module "gke-project-asm" {
   org_id            = var.org_id
   folder_id         = var.folder_id
   billing_account   = var.billing_account
+  # due to https://github.com/hashicorp/terraform-provider-google/issues/9505 for AP
+  default_service_account = "keep"
 
   activate_apis = local.apis
 }