run tf builder tests sequentially

Author: daniel-cit

build/int.cloudbuild.yaml

@@ -121,7 +121,7 @@ steps:
 
 - id: apply-tfbuilder-github
   waitFor:
-      - create-all
+      - teardown-tfbuilder
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestTFCloudBuildBuilderGitHub --stage apply --verbose']
   secretEnv: ['IM_GITHUB_PAT']
@@ -140,7 +140,7 @@ steps:
 
 - id: apply-tfbuilder-gitlab
   waitFor:
-      - create-all
+      - teardown-tfbuilder-github
   name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
   args: ['/bin/bash', '-c', 'cft test run TestTFCloudBuildBuilderGitLab --stage apply --verbose']
   secretEnv: ['IM_GITLAB_PAT']

examples/tf_cloudbuild_builder_simple/main.tf

@@ -14,20 +14,12 @@
  * limitations under the License.
  */
 
-resource "google_service_account" "cb_sa" {
-  project                      = module.enabled_google_apis.project_id
-  account_id                   = "tf-cb-builder-sa-s"
-  display_name                 = "SA for Terraform builder build trigger. Managed by Terraform."
-  create_ignore_already_exists = true
-}
-
 module "cloudbuilder" {
   source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
   version = "~> 8.0"
 
   project_id          = module.enabled_google_apis.project_id
   dockerfile_repo_uri = google_sourcerepo_repository.builder_dockerfile_repo.url
-  cloudbuild_sa       = google_service_account.cb_sa.id
   trigger_location    = "us-central1"
   gar_repo_location   = "us-central1"
   build_timeout       = "1200s"

examples/tf_cloudbuild_builder_simple_github/main.tf

@@ -24,13 +24,6 @@ locals {
   location = "us-central1"
 }
 
-resource "google_service_account" "cb_sa" {
-  project                      = module.enabled_google_apis.project_id
-  account_id                   = "tf-cb-builder-sa-gh"
-  display_name                 = "SA for Terraform builder build trigger. Managed by Terraform."
-  create_ignore_already_exists = true
-}
-
 module "cloudbuilder" {
   # source  = "terraform-google-modules/bootstrap/google//modules/tf_cloudbuild_builder"
   # version = "~> 8.0"
@@ -40,7 +33,6 @@ module "cloudbuilder" {
   dockerfile_repo_uri         = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
   dockerfile_repo_type        = "GITHUB"
   use_cloudbuildv2_repository = true
-  cloudbuild_sa               = google_service_account.cb_sa.id
   trigger_location            = local.location
   gar_repo_location           = local.location
   build_timeout               = "1200s"

examples/tf_cloudbuild_builder_simple_gitlab/main.tf

@@ -24,13 +24,6 @@ locals {
   location = "us-central1"
 }
 
-resource "google_service_account" "cb_sa" {
-  project                      = module.enabled_google_apis.project_id
-  account_id                   = "tf-cb-builder-sa-gl"
-  display_name                 = "SA for Terraform builder build trigger. Managed by Terraform."
-  create_ignore_already_exists = true
-}
-
 module "cloudbuilder" {
   source = "../../modules/tf_cloudbuild_builder"
 
@@ -39,7 +32,6 @@ module "cloudbuilder" {
   dockerfile_repo_uri         = module.git_repo_connection.cloud_build_repositories_2nd_gen_repositories["test_repo"].id
   dockerfile_repo_type        = "UNKNOWN" // "GITLAB" is not one of the options available so we need to use "UNKNOWN"
   use_cloudbuildv2_repository = true
-  cloudbuild_sa               = google_service_account.cb_sa.id
   trigger_location            = local.location
   gar_repo_location           = local.location
   build_timeout               = "1200s"