Merge branch 'master' into ap/diff_whitespace

GoogleCloudPlatform · Dec 2, 2024 · 5e37ffb · 5e37ffb
2 parents 080366e + 7e6b891
commit 5e37ffb
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 27 deletions.
diff --git a/infra/blueprint-test/Makefile b/infra/blueprint-test/Makefile
@@ -1,5 +1,5 @@
 SHELL := /bin/bash
-GOLANGCI_VERSION := 1.62.0
+GOLANGCI_VERSION := 1.62.2
 
 .PHONY: docker_go_lint
 docker_go_lint:

diff --git a/infra/terraform/test-org/ci-triggers/locals.tf b/infra/terraform/test-org/ci-triggers/locals.tf
@@ -30,8 +30,6 @@ 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/ci-triggers/triggers.tf b/infra/terraform/test-org/ci-triggers/triggers.tf
@@ -46,7 +46,7 @@ resource "google_cloudbuild_trigger" "int_trigger" {
   )
 
   filename      = "build/int.cloudbuild.yaml"
-  ignored_files = ["**/*.md", ".gitignore", ".github/**", "**/metadata.yaml", "assets/**", "infra/assets/**"]
+  ignored_files = ["**/*.md", ".gitignore", ".github/**", "**/metadata.yaml", "**/metadata.display.yaml", "assets/**", "infra/assets/**"]
 }
 
 # pull_request triggers do not support run trigger, so we have a shadow periodic trigger

diff --git a/infra/terraform/test-org/org/folders.tf b/infra/terraform/test-org/org/folders.tf
@@ -36,7 +36,8 @@ module "folders-ci" {
 
   names = [for module in [for repo in local.repos : try(repo.short_name, trimprefix(repo.name, "terraform-google-"))] : "ci-${module}"]
 
-  set_roles = false
+  set_roles           = false
+  deletion_protection = false
 }
 
 module "bpt_ci_folder" {

diff --git a/infra/terraform/test-org/org/locals.tf b/infra/terraform/test-org/org/locals.tf
@@ -798,28 +798,6 @@ 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          = ["team-egg", "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          = ["team-egg", "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"