fix: expose GAR repo name via substitutions in triggers (#97)

* fix: expose GAR repo name to triggers * bump kitchen test timeout
terraform-google-modules · Feb 25, 2021 · 9ac97a3 · 9ac97a3
1 parent 2f9b7f9
commit 9ac97a3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/kitchen.yml b/kitchen.yml
@@ -16,6 +16,7 @@
 driver:
   name: terraform
   verify_version: false
+  command_timeout: 1200
 
 provisioner:
   name: terraform

diff --git a/modules/cloudbuild/main.tf b/modules/cloudbuild/main.tf
@@ -166,6 +166,7 @@ resource "google_cloudbuild_trigger" "master_trigger" {
     _ORG_ID               = var.org_id
     _BILLING_ID           = var.billing_account
     _DEFAULT_REGION       = var.default_region
+    _GAR_REPOSITORY       = local.gar_name
     _TF_SA_EMAIL          = var.terraform_sa_email
     _STATE_BUCKET_NAME    = var.terraform_state_bucket
     _ARTIFACT_BUCKET_NAME = google_storage_bucket.cloudbuild_artifacts.name
@@ -197,6 +198,7 @@ resource "google_cloudbuild_trigger" "non_master_trigger" {
     _ORG_ID               = var.org_id
     _BILLING_ID           = var.billing_account
     _DEFAULT_REGION       = var.default_region
+    _GAR_REPOSITORY       = local.gar_name
     _TF_SA_EMAIL          = var.terraform_sa_email
     _STATE_BUCKET_NAME    = var.terraform_state_bucket
     _ARTIFACT_BUCKET_NAME = google_storage_bucket.cloudbuild_artifacts.name