Merge branch 'master' into ap-1243m

GoogleCloudPlatform · Sep 11, 2023 · 2966b01 · 2966b01
2 parents 1a4f58a + baf6073
commit 2966b01
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/infra/terraform/test-org/ci-triggers/locals.tf b/infra/terraform/test-org/ci-triggers/locals.tf
@@ -43,6 +43,8 @@ locals {
     "genai-doc-summarization"     = "terraform-genai-doc-summarization"
     "secured-notebook"            = "notebooks-blueprint-security"
     "sdw-onprem-ingest"           = "terraform-google-secured-data-warehouse-onprem-ingest"
+    "pubsub-golang-app"           = "terraform-pubsub-integration-golang"
+    "pubsub-java-app"             = "terraform-pubsub-integration-java"
   }
   # example foundation has custom test modes
   example_foundation                = { "terraform-example-foundation" = data.terraform_remote_state.org.outputs.ci_repos_folders["example-foundation"] }

diff --git a/infra/terraform/test-org/org/locals.tf b/infra/terraform/test-org/org/locals.tf
@@ -752,5 +752,21 @@ locals {
       owners      = ["anaik91", "imrannayer"]
       topics      = local.common_topics.db
     },
+    {
+      name            = "terraform-pubsub-integration-golang"
+      org             = "GoogleCloudPlatform"
+      short_name      = "pubsub-golang-app"
+      owners          = ["shabirmean", "Mukamik"]
+      groups          = ["dee-platform-ops", local.jss_common_group]
+      enable_periodic = true
+    },
+    {
+      name            = "terraform-pubsub-integration-java"
+      org             = "GoogleCloudPlatform"
+      short_name      = "pubsub-java-app"
+      owners          = ["shabirmean", "Mukamik"]
+      groups          = ["dee-platform-ops", local.jss_common_group]
+      enable_periodic = true
+    },
   ]
 }