Skip to content

Commit 1e3d7b9

Browse files
committed
Support conformance env lifecycle in GCP CI Cloud Build
1 parent 23e1970 commit 1e3d7b9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
output "docker" {
2+
description = "The artifact registry repository for Docker container images"
3+
value = google_artifact_registry_repository.docker
4+
}

deployment/modules/gcp/cloudbuild/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module "artifactregistry" {
2121
# Cloud Build
2222

2323
locals {
24-
artifact_repo = "${var.location}-docker.pkg.dev/${var.project_id}/${google_artifact_registry_repository.docker.name}"
24+
artifact_repo = "${var.location}-docker.pkg.dev/${var.project_id}/${module.artifactregistry.docker.name}"
2525
conformance_gcp_docker_image = "${local.artifact_repo}/conformance-gcp"
2626
}
2727

@@ -101,9 +101,9 @@ resource "google_project_iam_member" "resourcemanager_project_iam_admin" {
101101
}
102102

103103
resource "google_artifact_registry_repository_iam_member" "artifactregistry_writer" {
104-
project = google_artifact_registry_repository.docker.project
105-
location = google_artifact_registry_repository.docker.location
106-
repository = google_artifact_registry_repository.docker.name
104+
project = module.docker.project
105+
location = module.artifactregistry.docker.location
106+
repository = module.artifactregistry.docker.name
107107
role = "roles/artifactregistry.writer"
108108
member = "serviceAccount:${google_service_account.cloudbuild_service_account.email}"
109109
}

0 commit comments

Comments
 (0)