diff --git a/mmv1/third_party/terraform/.teamcity/components/generated/project.erb b/mmv1/third_party/terraform/.teamcity/components/generated/project.erb index 8453e7ad3879..142df723ffac 100644 --- a/mmv1/third_party/terraform/.teamcity/components/generated/project.erb +++ b/mmv1/third_party/terraform/.teamcity/components/generated/project.erb @@ -60,8 +60,12 @@ fun Google<%= version.capitalize unless version == 'ga' -%>(environment: String, // Adding this allows custom builds to use alternative branches. E.g. testing release branches in the downstreams params { + // Controls the VCS root, and allows custom builds to point at different branches param("BRANCH_NAME", branchRef) - +<% unless version == 'ga' -%> + // Skip the sweeper for project resources in the Beta tests only + param("env.SKIP_PROJECT_SWEEPER", 1) +<% end -%> // Not used, but making `environment` a param makes the value visible to non-admins in TeamCity param("ENVIRONMENT", environment) } diff --git a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_sweeper.go b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_sweeper.go index 33ec9a89712d..a2492a3784be 100644 --- a/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_sweeper.go +++ b/mmv1/third_party/terraform/services/resourcemanager/resource_google_project_sweeper.go @@ -21,6 +21,7 @@ func init() { // already be in-progress. // Example: SKIP_PROJECT_SWEEPER=1 go test ./google -v -sweep=us-central1 -sweep-run= if os.Getenv("SKIP_PROJECT_SWEEPER") != "" { + // No logging here - see https://github.com/GoogleCloudPlatform/magic-modules/pull/7439 return }