chore: fix CI test sequencing and machine type (#1735)

terraform-google-modules · Sep 13, 2023 · 3f27bc2 · 3f27bc2
1 parent b4ccabe
commit 3f27bc2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -103,7 +103,7 @@ steps:
   args: ['/bin/bash', '-c', 'cft test run TestSimpleRegional --stage verify --verbose']
 - id: destroy simple-regional-local
   waitFor:
-    - apply simple-regional-local
+    - verify simple-regional-local
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestSimpleRegional --stage teardown --verbose']
 - id: init simple-regional-private-local
@@ -443,7 +443,7 @@ steps:
   args: ['/bin/bash', '-c', 'cft test run TestSimpleAutopilotPrivate --stage verify --verbose']
 - id: destroy simple-autopilot-private-local
   waitFor:
-    - apply simple-autopilot-private-local
+    - verify simple-autopilot-private-local
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestSimpleAutopilotPrivate --stage teardown --verbose']
 - id: init simple-autopilot-public-local

diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -50,18 +50,17 @@ module "gke" {
       auto_upgrade    = true
     },
     {
-      name               = "pool-02"
-      machine_type       = "a2-highgpu-1g"
-      min_count          = 1
-      max_count          = 2
-      local_ssd_count    = 0
-      disk_size_gb       = 30
-      disk_type          = "pd-standard"
-      accelerator_count  = 1
-      accelerator_type   = "nvidia-tesla-a100"
-      gpu_partition_size = "1g.5gb"
-      auto_repair        = false
-      service_account    = var.compute_engine_service_account
+      name              = "pool-02"
+      machine_type      = "n1-standard-2"
+      min_count         = 1
+      max_count         = 2
+      local_ssd_count   = 0
+      disk_size_gb      = 30
+      disk_type         = "pd-standard"
+      accelerator_count = 1
+      accelerator_type  = "nvidia-tesla-p4"
+      auto_repair       = false
+      service_account   = var.compute_engine_service_account
     },
     {
       name               = "pool-03"

diff --git a/test/fixtures/node_pool/example.tf b/test/fixtures/node_pool/example.tf
@@ -20,7 +20,7 @@ module "example" {
   project_id                     = var.project_ids[0]
   cluster_name_suffix            = "-${random_string.suffix.result}"
   region                         = "europe-west4"
-  zones                          = ["europe-west4-a"]
+  zones                          = ["europe-west4-b"]
   network                        = google_compute_network.main.name
   subnetwork                     = google_compute_subnetwork.main.name
   ip_range_pods                  = google_compute_subnetwork.main.secondary_ip_range[0].range_name

diff --git a/test/integration/node_pool/controls/gcloud.rb b/test/integration/node_pool/controls/gcloud.rb
@@ -17,7 +17,7 @@
 cluster_name = attribute('cluster_name')
 
 expected_accelerators_count = "1"
-expected_accelerators_type = "nvidia-tesla-a100"
+expected_accelerators_type = "nvidia-tesla-p4"
 
 control "gcloud" do
   title "Google Compute Engine GKE configuration"
@@ -218,7 +218,7 @@
             including(
               "name" => "pool-02",
               "config" => including(
-                "machineType" => "a2-highgpu-1g",
+                "machineType" => "n1-standard-2",
               ),
             )
           )
@@ -263,8 +263,7 @@
               "name" => "pool-02",
               "config" => including(
                 "accelerators" => [{"acceleratorCount" => expected_accelerators_count,
-                                    "acceleratorType" => expected_accelerators_type,
-                                    "gpuPartitionSize" => "1g.5gb"}],
+                                    "acceleratorType" => expected_accelerators_type}],
               ),
             )
           )