From e494aaaaeceda219ca732eaaf81725c970d09c26 Mon Sep 17 00:00:00 2001 From: aaronabbott Date: Fri, 29 May 2026 21:01:04 +0000 Subject: [PATCH] chore: update E2E tests to use centralized async cleanup 0.22.0 --- cloudbuild-e2e-cloud-functions-gen2.yaml | 9 +++++++-- cloudbuild-e2e-cloud-run.yaml | 9 +++++++-- cloudbuild-e2e-gae.yaml | 9 +++++++-- cloudbuild-e2e-gce.yaml | 9 +++++++-- cloudbuild-e2e-gke.yaml | 9 +++++++-- cloudbuild-e2e-local.yaml | 9 +++++++-- 6 files changed, 42 insertions(+), 12 deletions(-) diff --git a/cloudbuild-e2e-cloud-functions-gen2.yaml b/cloudbuild-e2e-cloud-functions-gen2.yaml index 041e623c..b9cb2daa 100644 --- a/cloudbuild-e2e-cloud-functions-gen2.yaml +++ b/cloudbuild-e2e-cloud-functions-gen2.yaml @@ -35,14 +35,19 @@ steps: - name: $_TEST_RUNNER_IMAGE id: run-tests-cloudfunction dir: / - env: ["PROJECT_ID=$PROJECT_ID"] + env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"] args: - cloud-functions-gen2 - --functionsource=/workspace/e2e-test-server/build/libs/function-source.zip - --runtime=java17 - --entrypoint=com.google.cloud.opentelemetry.endtoend.CloudFunctionHandler + - --skip-cleanup logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs substitutions: - _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0 + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0 _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA} + +options: + # Notify for Cloud Build async cleanup trigger + pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup diff --git a/cloudbuild-e2e-cloud-run.yaml b/cloudbuild-e2e-cloud-run.yaml index b791005b..34f4767a 100644 --- a/cloudbuild-e2e-cloud-run.yaml +++ b/cloudbuild-e2e-cloud-run.yaml @@ -25,12 +25,17 @@ steps: - name: $_TEST_RUNNER_IMAGE id: run-tests-cloudrun dir: / - env: ["PROJECT_ID=$PROJECT_ID"] + env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"] args: - cloud-run - --image=$_TEST_SERVER_IMAGE + - --skip-cleanup logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs substitutions: - _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0 + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0 _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA} + +options: + # Notify for Cloud Build async cleanup trigger + pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup diff --git a/cloudbuild-e2e-gae.yaml b/cloudbuild-e2e-gae.yaml index 210d76f4..57a53108 100644 --- a/cloudbuild-e2e-gae.yaml +++ b/cloudbuild-e2e-gae.yaml @@ -25,13 +25,18 @@ steps: - name: $_TEST_RUNNER_IMAGE id: run-tests-gae dir: / - env: [ "PROJECT_ID=$PROJECT_ID" ] + env: [ "PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID" ] args: - gae - --image=$_TEST_SERVER_IMAGE - --runtime=java11 + - --skip-cleanup logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs substitutions: - _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0 + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0 _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA} + +options: + # Notify for Cloud Build async cleanup trigger + pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup diff --git a/cloudbuild-e2e-gce.yaml b/cloudbuild-e2e-gce.yaml index 1ff3d3e7..d4c2abe2 100644 --- a/cloudbuild-e2e-gce.yaml +++ b/cloudbuild-e2e-gce.yaml @@ -25,12 +25,17 @@ steps: - name: $_TEST_RUNNER_IMAGE id: run-tests-gce dir: / - env: ["PROJECT_ID=$PROJECT_ID"] + env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"] args: - gce - --image=$_TEST_SERVER_IMAGE + - --skip-cleanup logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs substitutions: - _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0 + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0 _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA} + +options: + # Notify for Cloud Build async cleanup trigger + pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup diff --git a/cloudbuild-e2e-gke.yaml b/cloudbuild-e2e-gke.yaml index 57fd66d2..219f2eee 100644 --- a/cloudbuild-e2e-gke.yaml +++ b/cloudbuild-e2e-gke.yaml @@ -25,12 +25,17 @@ steps: - name: $_TEST_RUNNER_IMAGE id: run-tests-gke dir: / - env: ["PROJECT_ID=$PROJECT_ID"] + env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"] args: - gke - --image=$_TEST_SERVER_IMAGE + - --skip-cleanup logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs substitutions: - _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0 + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0 _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA} + +options: + # Notify for Cloud Build async cleanup trigger + pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup diff --git a/cloudbuild-e2e-local.yaml b/cloudbuild-e2e-local.yaml index a5e2cf7d..84dff6c7 100644 --- a/cloudbuild-e2e-local.yaml +++ b/cloudbuild-e2e-local.yaml @@ -31,13 +31,18 @@ steps: - name: $_TEST_RUNNER_IMAGE id: run-tests-local dir: / - env: ["PROJECT_ID=$PROJECT_ID"] + env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"] args: - local - --image=$_TEST_SERVER_IMAGE - --network=cloudbuild + - --skip-cleanup logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs substitutions: - _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0 + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0 _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-java-e2e-test-server:${SHORT_SHA} + +options: + # Notify for Cloud Build async cleanup trigger + pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup