Skip to content

chore: update E2E tests to use centralized async cleanup 0.22.0 #523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aabmass merged 1 commit into from
May 29, 2026
Merged

chore: update E2E tests to use centralized async cleanup 0.22.0 #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions cloudbuild-e2e-cloud-functions-gen2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 7 additions & 2 deletions cloudbuild-e2e-cloud-run.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 7 additions & 2 deletions cloudbuild-e2e-gae-standard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 7 additions & 2 deletions cloudbuild-e2e-gae.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 7 additions & 2 deletions cloudbuild-e2e-gce.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 7 additions & 2 deletions cloudbuild-e2e-gke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 7 additions & 2 deletions cloudbuild-e2e-local.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading