diff --git a/0-bootstrap/cb.tf b/0-bootstrap/cb.tf index 8c2ba91b4..700d2bd68 100644 --- a/0-bootstrap/cb.tf +++ b/0-bootstrap/cb.tf @@ -103,7 +103,7 @@ module "tf_source" { "logging.googleapis.com", "iam.googleapis.com", "admin.googleapis.com", - "sourcerepo.googleapis.com", + // "sourcerepo.googleapis.com", // issue #1309: Docker tests fail due to CSR dependency "workflows.googleapis.com", "artifactregistry.googleapis.com", "cloudbuild.googleapis.com", diff --git a/4-projects/business_unit_1/shared/example_infra_pipeline.tf b/4-projects/business_unit_1/shared/example_infra_pipeline.tf index 7b09e6cd6..e23e042f9 100644 --- a/4-projects/business_unit_1/shared/example_infra_pipeline.tf +++ b/4-projects/business_unit_1/shared/example_infra_pipeline.tf @@ -30,7 +30,7 @@ module "app_infra_cloudbuild_project" { project_prefix = local.project_prefix activate_apis = [ "cloudbuild.googleapis.com", - "sourcerepo.googleapis.com", + // "sourcerepo.googleapis.com", // issue #1309: Docker tests fail due to CSR dependency "cloudkms.googleapis.com", "iam.googleapis.com", "artifactregistry.googleapis.com", diff --git a/test/integration/bootstrap/bootstrap_test.go b/test/integration/bootstrap/bootstrap_test.go index 41e46466b..b49bcd32c 100644 --- a/test/integration/bootstrap/bootstrap_test.go +++ b/test/integration/bootstrap/bootstrap_test.go @@ -62,15 +62,16 @@ func TestBootstrap(t *testing.T) { tft.WithPolicyLibraryPath("/workspace/policy-library", temp.GetTFSetupStringOutput("project_id")), ) - cloudSourceRepos := []string{ - "gcp-org", - "gcp-environments", - "gcp-networks", - "gcp-projects", - "gcp-policies", - "tf-cloudbuilder", - "gcp-bootstrap", - } + // issue #1309: Docker tests fail due to CSR dependency + // cloudSourceRepos := []string{ + // "gcp-org", + // "gcp-environments", + // "gcp-networks", + // "gcp-projects", + // "gcp-policies", + // "tf-cloudbuilder", + // "gcp-bootstrap", + // } triggerRepos := []string{ "gcp-bootstrap", @@ -111,7 +112,7 @@ func TestBootstrap(t *testing.T) { "storage-api.googleapis.com", "serviceusage.googleapis.com", "cloudbuild.googleapis.com", - "sourcerepo.googleapis.com", + // "sourcerepo.googleapis.com", // issue #1309: Docker tests fail due to CSR dependency "cloudkms.googleapis.com", "bigquery.googleapis.com", "accesscontextmanager.googleapis.com", @@ -207,11 +208,12 @@ func TestBootstrap(t *testing.T) { assert.Equal(logsBktName[bkts.env], fmt.Sprintf("bkt-%s-%s-build-logs", cbProjectID, bkts.repo)) } - for _, repo := range cloudSourceRepos { - sourceRepoFullName := fmt.Sprintf("projects/%s/repos/%s", cbProjectID, repo) - sourceRepo := gcloud.Runf(t, "source repos describe %s --project %s", repo, cbProjectID) - assert.Equal(sourceRepoFullName, sourceRepo.Get("name").String(), fmt.Sprintf("repository %s should exist", repo)) - } + // issue #1309: Docker tests fail due to CSR dependency + // for _, repo := range cloudSourceRepos { + // sourceRepoFullName := fmt.Sprintf("projects/%s/repos/%s", cbProjectID, repo) + // sourceRepo := gcloud.Runf(t, "source repos describe %s --project %s", repo, cbProjectID) + // assert.Equal(sourceRepoFullName, sourceRepo.Get("name").String(), fmt.Sprintf("repository %s should exist", repo)) + // } for _, triggerRepo := range triggerRepos { for _, filter := range []string{ diff --git a/test/integration/projects-shared/projects_shared_test.go b/test/integration/projects-shared/projects_shared_test.go index 71c14681d..fddc72f76 100644 --- a/test/integration/projects-shared/projects_shared_test.go +++ b/test/integration/projects-shared/projects_shared_test.go @@ -46,7 +46,7 @@ func TestProjectsShared(t *testing.T) { var sharedApisEnabled = []string{ "cloudbuild.googleapis.com", - "sourcerepo.googleapis.com", + // "sourcerepo.googleapis.com", // issue #1309: Docker tests fail due to CSR dependency "cloudkms.googleapis.com", } diff --git a/test/setup/main.tf b/test/setup/main.tf index 7b85df91d..3921670d8 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -62,7 +62,7 @@ module "project" { "storage-api.googleapis.com", "serviceusage.googleapis.com", "cloudbuild.googleapis.com", - "sourcerepo.googleapis.com", + // "sourcerepo.googleapis.com", // issue #1309: Docker tests fail due to CSR dependency "cloudkms.googleapis.com", "bigquery.googleapis.com", "accesscontextmanager.googleapis.com",