From 5d2b5c1354d3e0ef7798f474bd48ead219a3748b Mon Sep 17 00:00:00 2001 From: aaronabbott Date: Fri, 29 May 2026 20:59:09 +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-standard.yaml | 9 +++++++-- cloudbuild-e2e-gae.yaml | 9 +++++++-- cloudbuild-e2e-gce.yaml | 9 +++++++-- cloudbuild-e2e-gke.yaml | 9 +++++++-- cloudbuild-e2e-local.yaml | 9 +++++++-- 7 files changed, 49 insertions(+), 14 deletions(-) diff --git a/cloudbuild-e2e-cloud-functions-gen2.yaml b/cloudbuild-e2e-cloud-functions-gen2.yaml index fe614f0b..d58d40dc 100644 --- a/cloudbuild-e2e-cloud-functions-gen2.yaml +++ b/cloudbuild-e2e-cloud-functions-gen2.yaml @@ -36,13 +36,18 @@ steps: - name: $_TEST_RUNNER_IMAGE id: run-tests-cloud-run 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/function-source.zip - --runtime=python311 - --entrypoint=cloud_functions_handler + - --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 + +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 e358caf2..ae0b82b0 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-cloud-run 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-python-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-standard.yaml b/cloudbuild-e2e-gae-standard.yaml index 4be2a2ea..911d5e27 100644 --- a/cloudbuild-e2e-gae-standard.yaml +++ b/cloudbuild-e2e-gae-standard.yaml @@ -36,13 +36,18 @@ steps: - name: $_TEST_RUNNER_IMAGE id: run-tests-gae-standard dir: / - env: ["PROJECT_ID=$PROJECT_ID"] + env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"] args: - gae-standard - --runtime=python311 - --entrypoint=python main.py - --appsource=/workspace/e2e-test-server/appsource.zip + - --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 + +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 dafba091..43b54dca 100644 --- a/cloudbuild-e2e-gae.yaml +++ b/cloudbuild-e2e-gae.yaml @@ -26,14 +26,19 @@ 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=python + - --skip-cleanup logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs timeout: 20m 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-python-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 0349caee..eb5fdec9 100644 --- a/cloudbuild-e2e-gce.yaml +++ b/cloudbuild-e2e-gce.yaml @@ -26,13 +26,18 @@ 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 - --health-check-timeout=5m + - --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-python-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 a14d9435..48f51800 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-python-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 7d9aa2bf..2af9e459 100644 --- a/cloudbuild-e2e-local.yaml +++ b/cloudbuild-e2e-local.yaml @@ -32,13 +32,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-python-e2e-test-server:${SHORT_SHA} + +options: + # Notify for Cloud Build async cleanup trigger + pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup