From 9ac97a3393ebfbfd5425fec7ff5cb63bdc1c2cae Mon Sep 17 00:00:00 2001 From: Bharath KKB Date: Wed, 24 Feb 2021 18:11:34 -0600 Subject: [PATCH] fix: expose GAR repo name via substitutions in triggers (#97) * fix: expose GAR repo name to triggers * bump kitchen test timeout --- kitchen.yml | 1 + modules/cloudbuild/main.tf | 2 ++ 2 files changed, 3 insertions(+) diff --git a/kitchen.yml b/kitchen.yml index d0dcaaef..58ee615b 100644 --- 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 index b4ac3cd8..0f090c9d 100644 --- 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