From 354ae3fad05a8d3a604d645aebe0419d3524f581 Mon Sep 17 00:00:00 2001
From: Andrew Peabody <andrewpeabody@google.com>
Date: Wed, 20 Sep 2023 16:55:20 +0000
Subject: [PATCH] chore: bump to dev-tools v1.11

---
 Makefile                                               |  2 +-
 build/int.cloudbuild.yaml                              | 10 +++++-----
 build/lint.cloudbuild.yaml                             |  2 +-
 .../beta_cluster/testdata/TestBetaCluster.json         |  2 +-
 .../simple_regional/testdata/TestSimpleRegional.json   |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 45f6c99a45..7aeab7e7f0 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.10
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.11
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 DOCKER_BIN ?= docker
diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
index ef2e9f6637..ec82cff0a0 100644
--- a/build/int.cloudbuild.yaml
+++ b/build/int.cloudbuild.yaml
@@ -28,7 +28,7 @@ steps:
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do create']
 - id: init disable-client-cert
   waitFor:
-    - prepare
+    - create all
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestDisableClientCert --stage init --verbose --test-dir test/integration']
 - id: apply disable-client-cert
@@ -283,7 +283,7 @@ steps:
   args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy workload-metadata-config-local']
 - id: init beta-cluster
   waitFor:
-    - prepare
+    - create all
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestBetaCluster --stage init --verbose --test-dir test/integration']
 - id: apply beta-cluster
@@ -468,7 +468,7 @@ steps:
   args: ['/bin/bash', '-c', 'cft test run TestSimpleAutopilotPublic --stage teardown --verbose']
 - id: init private-zonal-with-networking
   waitFor:
-    - prepare
+    - create all
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestPrivateZonalWithNetworking --stage init --verbose --test-dir test/integration']
 - id: apply private-zonal-with-networking
@@ -488,7 +488,7 @@ steps:
   args: ['/bin/bash', '-c', 'cft test run TestPrivateZonalWithNetworking --stage teardown --verbose --test-dir test/integration']
 - id: init simple-autopilot-private-non-default-sa
   waitFor:
-    - prepare
+    - create all
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestSimpleAutopilotPrivateNonDefaultSA --stage init --verbose']
 - id: apply simple-autopilot-private-non-default-sa
@@ -511,6 +511,6 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.11'
 options:
   machineType: 'N1_HIGHCPU_8'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
index b163e13577..c28adcfca9 100644
--- a/build/lint.cloudbuild.yaml
+++ b/build/lint.cloudbuild.yaml
@@ -22,7 +22,7 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.10'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '1.11'
 options:
   machineType: 'N1_HIGHCPU_8'
   env:
diff --git a/test/integration/beta_cluster/testdata/TestBetaCluster.json b/test/integration/beta_cluster/testdata/TestBetaCluster.json
index f1beb5f564..5daccb0acb 100755
--- a/test/integration/beta_cluster/testdata/TestBetaCluster.json
+++ b/test/integration/beta_cluster/testdata/TestBetaCluster.json
@@ -321,4 +321,4 @@
   "subnetwork": "cft-gke-test-qwc4",
   "verticalPodAutoscaling": {},
   "zone": "us-central1"
-}
\ No newline at end of file
+}
diff --git a/test/integration/simple_regional/testdata/TestSimpleRegional.json b/test/integration/simple_regional/testdata/TestSimpleRegional.json
index 31d14b4180..dec9d87fd5 100644
--- a/test/integration/simple_regional/testdata/TestSimpleRegional.json
+++ b/test/integration/simple_regional/testdata/TestSimpleRegional.json
@@ -328,4 +328,4 @@
     "workloadPool": "PROJECT_ID.svc.id.goog"
   },
   "zone": "us-central1"
-}
\ No newline at end of file
+}