Merge branch 'master' into ap-394k

GoogleCloudPlatform · Sep 20, 2023 · de26b1b · de26b1b
2 parents 348cfd2 + fcdefc7
commit de26b1b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/infra/build/Makefile b/infra/build/Makefile
@@ -16,7 +16,7 @@ SHELL := /usr/bin/env bash # Make will use bash instead of sh
 # Updated by Update Tooling Workflow
 TERRAFORM_VERSION := 1.5.7
 # Updated by Update Tooling Workflow
-CLOUD_SDK_VERSION := 446.0.1
+CLOUD_SDK_VERSION := 447.0.0
 GSUITE_PROVIDER_VERSION := 0.1.22
 TERRAFORM_DOCS_VERSION := 0.16.0
 BATS_VERSION := 0.4.0
@@ -25,7 +25,7 @@ BATS_ASSERT_VERSION := 2.0.0
 BATS_MOCK_VERSION := 1.0.1
 PACKER_VERSION := 1.4.4
 # Updated by Update Tooling Workflow
-TERRAGRUNT_VERSION := 0.50.16
+TERRAGRUNT_VERSION := 0.51.3
 # Updated by Update Tooling Workflow
 KUSTOMIZE_VERSION := 5.1.1
 # Updated by Update Tooling Workflow
@@ -43,7 +43,7 @@ TFLINT_VERSION := 0.48.0
 TINKEY_VERSION := 1.7.0
 ALPINE_VERSION := 3.18
 # Updated by Update Tooling Workflow
-MODULE_SWAPPER_VERSION := 0.2.1
+MODULE_SWAPPER_VERSION := 0.2.2
 
 # For developer-tools-krm
 GOLANGCI_VERSION := 1.54.1
@@ -55,7 +55,7 @@ OPA_VERSION := 0.52.0
 # Updated by Update Tooling Workflow
 GCRANE_VERSION := 0.16.1
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.16.2
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 1.16.3
 DOCKER_TAG_MAJOR_VERSION_DEVELOPER_TOOLS := $(firstword $(subst ., , $(DOCKER_TAG_VERSION_DEVELOPER_TOOLS)))
 DOCKER_TAG_MINOR_VERSION_DEVELOPER_TOOLS := $(shell echo "${DOCKER_TAG_VERSION_DEVELOPER_TOOLS}" | awk -F. '{print $$1"."$$2}')
 

diff --git a/infra/terraform/test-org/ci-triggers/locals.tf b/infra/terraform/test-org/ci-triggers/locals.tf
@@ -30,6 +30,8 @@ locals {
     "cloud-foundation-training"   = "cloud-foundation-training",
     "example-foundation-app"      = "terraform-example-foundation-app",
     "anthos-samples"              = "anthos-samples"
+    "cloud-deployment-gce"        = "terraform-cloud-deployment-gce",
+    "cloud-deployment-gke"        = "terraform-cloud-deployment-gke",
     "docs-samples"                = "terraform-docs-samples"
     "dynamic-python-webapp"       = "terraform-dynamic-python-webapp"
     "dynamic-javascript-webapp"   = "terraform-dynamic-javascript-webapp"

diff --git a/infra/terraform/test-org/org/locals.tf b/infra/terraform/test-org/org/locals.tf
@@ -752,6 +752,28 @@ locals {
       owners      = ["anaik91", "imrannayer"]
       topics      = local.common_topics.db
     },
+    {
+      name            = "terraform-cloud-deployment-gce"
+      short_name      = "cloud-deployment-gce"
+      org             = "GoogleCloudPlatform"
+      description     = "Deploy a change to a live stateful service (Java on GCE)"
+      groups          = ["torus-dpe", "dee-platform-ops", "dee-data-ai", local.jss_common_group]
+      enable_periodic = true
+      lint_env = {
+        ENABLE_BPMETADATA = "1"
+      }
+    },
+    {
+      name            = "terraform-cloud-deployment-gke"
+      short_name      = "cloud-deployment-gke"
+      org             = "GoogleCloudPlatform"
+      description     = "Deploy a change to a live stateful service (Go on GKE)"
+      groups          = ["torus-dpe", "dee-platform-ops", "dee-data-ai", local.jss_common_group]
+      enable_periodic = true
+      lint_env = {
+        ENABLE_BPMETADATA = "1"
+      }
+    },
     {
       name            = "terraform-pubsub-integration-golang"
       org             = "GoogleCloudPlatform"