From f2dbab9eafbd82b2f4d75c9390ce65c48fbf646e Mon Sep 17 00:00:00 2001
From: Adam Ross <adamross@google.com>
Date: Thu, 18 May 2023 11:40:45 -0700
Subject: [PATCH 1/5] testing: Use low-reputation billing account

---
 build/int.cloudbuild.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
index 1c61fd84..4a2c6503 100644
--- a/build/int.cloudbuild.yaml
+++ b/build/int.cloudbuild.yaml
@@ -21,7 +21,7 @@ steps:
   env:
   - 'TF_VAR_org_id=$_ORG_ID'
   - 'TF_VAR_folder_id=$_FOLDER_ID'
-  - 'TF_VAR_billing_account=$_BILLING_ACCOUNT'
+  - 'TF_VAR_billing_account=$_LR_BILLING_ACCOUNT'
 - id: simple-example-init
   dir: infra
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'

From 8874d137e460f2cf8f81e810c3b69d6227ac2e25 Mon Sep 17 00:00:00 2001
From: Adam Ross <adamross@google.com>
Date: Thu, 18 May 2023 12:29:27 -0700
Subject: [PATCH 2/5] temporary: override to region with reported deploy
 failures

---
 build/int.cloudbuild.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
index 4a2c6503..badad5b2 100644
--- a/build/int.cloudbuild.yaml
+++ b/build/int.cloudbuild.yaml
@@ -38,6 +38,12 @@ steps:
   dir: infra
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestSimpleExample --stage teardown --verbose']
+
+# TEMPORARY: Override build to a region with reported deploy failures.
+options:
+  env:
+  - 'TF_VAR_region=asia-southeast1'
+  - 'TF_VAR_zone=asia-southeast1-a'
 tags:
 - 'ci'
 - 'integration'

From 07459523ebb249357c44106f8c1574b5402345b1 Mon Sep 17 00:00:00 2001
From: Adam Ross <adamross@google.com>
Date: Thu, 18 May 2023 12:53:57 -0700
Subject: [PATCH 3/5] Revert "temporary: override to region with reported
 deploy failures"

This reverts commit 8874d137e460f2cf8f81e810c3b69d6227ac2e25.
---
 build/int.cloudbuild.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
index badad5b2..4a2c6503 100644
--- a/build/int.cloudbuild.yaml
+++ b/build/int.cloudbuild.yaml
@@ -38,12 +38,6 @@ steps:
   dir: infra
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestSimpleExample --stage teardown --verbose']
-
-# TEMPORARY: Override build to a region with reported deploy failures.
-options:
-  env:
-  - 'TF_VAR_region=asia-southeast1'
-  - 'TF_VAR_zone=asia-southeast1-a'
 tags:
 - 'ci'
 - 'integration'

From 5e0be98b57f9bb24f6a513b54430dabdc53474d3 Mon Sep 17 00:00:00 2001
From: Adam Ross <adamross@google.com>
Date: Thu, 18 May 2023 12:54:23 -0700
Subject: [PATCH 4/5] temporary: override region and zone via variables.tf
 defaults

---
 infra/variables.tf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/infra/variables.tf b/infra/variables.tf
index 3a334424..f5fb2033 100644
--- a/infra/variables.tf
+++ b/infra/variables.tf
@@ -22,7 +22,8 @@ variable "project_id" {
 }
 
 variable "region" {
-  default     = "us-central1"
+  # temporary override from us-central1
+  default     = "asia-southeast1"
   type        = string
   description = "Google Cloud Region"
 }
@@ -30,9 +31,10 @@ variable "region" {
 # HSA
 
 variable "zone" {
+  # temporary override from us-central1-c
   type        = string
   description = "GCP zone for provisioning zonal resources."
-  default     = "us-central1-c"
+  default     = "asia-southeast1-a"
 }
 
 variable "labels" {

From 709c1d0ceba93e71c29749a191ddaf67171bda39 Mon Sep 17 00:00:00 2001
From: Adam Ross <adamross@google.com>
Date: Tue, 23 May 2023 13:27:22 -0700
Subject: [PATCH 5/5] Revert "temporary: override region and zone via
 variables.tf defaults"

This reverts commit 5e0be98b57f9bb24f6a513b54430dabdc53474d3.
---
 infra/variables.tf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/infra/variables.tf b/infra/variables.tf
index f5fb2033..3a334424 100644
--- a/infra/variables.tf
+++ b/infra/variables.tf
@@ -22,8 +22,7 @@ variable "project_id" {
 }
 
 variable "region" {
-  # temporary override from us-central1
-  default     = "asia-southeast1"
+  default     = "us-central1"
   type        = string
   description = "Google Cloud Region"
 }
@@ -31,10 +30,9 @@ variable "region" {
 # HSA
 
 variable "zone" {
-  # temporary override from us-central1-c
   type        = string
   description = "GCP zone for provisioning zonal resources."
-  default     = "asia-southeast1-a"
+  default     = "us-central1-c"
 }
 
 variable "labels" {