Skip to content

Commit

Permalink
Output conformance bucket and use in GCB (#453)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlCutter authored Jan 17, 2025
1 parent ecacf9c commit ee70a89
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
3 changes: 2 additions & 1 deletion deployment/modules/gcp/cloudbuild/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ resource "google_cloudbuild_trigger" "docker" {
export TESSERA_SIGNER=$(cat /workspace/key.sec)
export TESSERA_CLOUD_RUN_DOCKER_IMAGE=unused,
terragrunt output --raw conformance_url > /workspace/conformance_url
terragrunt output --raw conformance_bucket_name > /workspace/conformance_bucket_name
EOT
wait_for = ["terraform_apply_conformance_ci"]
}
Expand All @@ -147,7 +148,7 @@ resource "google_cloudbuild_trigger" "docker" {
apt update && apt install -y retry
retry -t 5 -d 15 --until=success go run ./internal/hammer \
--log_public_key=$(cat /workspace/key.pub) \
--log_url=https://storage.googleapis.com/trillian-tessera-ci-conformance-bucket/ \
--log_url=https://storage.googleapis.com/$(cat /workspace/conformance_bucket_name)/ \
--write_log_url="$(cat /workspace/conformance_url)" \
-v=1 \
--show_ui=false \
Expand Down
6 changes: 3 additions & 3 deletions deployment/modules/gcp/conformance/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ resource "google_cloud_run_v2_service" "default" {
}

startup_probe {
initial_delay_seconds = 1
timeout_seconds = 1
initial_delay_seconds = 10
timeout_seconds = 10
period_seconds = 10
failure_threshold = 6
failure_threshold = 10
tcp_socket {
port = 8080
}
Expand Down
5 changes: 5 additions & 0 deletions deployment/modules/gcp/conformance/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ output "conformance_url" {
description = "The URL of the running conformance server"
value = google_cloud_run_v2_service.default.uri
}

output "conformance_bucket_name" {
description = "The name of the conformance log bucket"
value = module.gcs.log_bucket.name
}

0 comments on commit ee70a89

Please sign in to comment.