Skip to content

Commit 5d2b5c1

Browse files
aabmassaabmass
committed
chore: update E2E tests to use centralized async cleanup 0.22.0
1 parent 28ec332 commit 5d2b5c1

7 files changed

Lines changed: 49 additions & 14 deletions

‎cloudbuild-e2e-cloud-functions-gen2.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,18 @@ steps:
3636
- name: $_TEST_RUNNER_IMAGE
3737
id: run-tests-cloud-run
3838
dir: /
39-
env: ["PROJECT_ID=$PROJECT_ID"]
39+
env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"]
4040
args:
4141
- cloud-functions-gen2
4242
- --functionsource=/workspace/e2e-test-server/function-source.zip
4343
- --runtime=python311
4444
- --entrypoint=cloud_functions_handler
45+
- --skip-cleanup
4546

4647
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
4748
substitutions:
48-
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0
49+
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0
50+
51+
options:
52+
# Notify for Cloud Build async cleanup trigger
53+
pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup

‎cloudbuild-e2e-cloud-run.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,17 @@ steps:
2525
- name: $_TEST_RUNNER_IMAGE
2626
id: run-tests-cloud-run
2727
dir: /
28-
env: ["PROJECT_ID=$PROJECT_ID"]
28+
env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"]
2929
args:
3030
- cloud-run
3131
- --image=$_TEST_SERVER_IMAGE
32+
- --skip-cleanup
3233

3334
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3435
substitutions:
35-
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0
36+
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0
3637
_TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}
38+
39+
options:
40+
# Notify for Cloud Build async cleanup trigger
41+
pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup

‎cloudbuild-e2e-gae-standard.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,18 @@ steps:
3636
- name: $_TEST_RUNNER_IMAGE
3737
id: run-tests-gae-standard
3838
dir: /
39-
env: ["PROJECT_ID=$PROJECT_ID"]
39+
env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"]
4040
args:
4141
- gae-standard
4242
- --runtime=python311
4343
- --entrypoint=python main.py
4444
- --appsource=/workspace/e2e-test-server/appsource.zip
45+
- --skip-cleanup
4546

4647
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
4748
substitutions:
48-
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0
49+
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0
50+
51+
options:
52+
# Notify for Cloud Build async cleanup trigger
53+
pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup

‎cloudbuild-e2e-gae.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,19 @@ steps:
2626
- name: $_TEST_RUNNER_IMAGE
2727
id: run-tests-gae
2828
dir: /
29-
env: ["PROJECT_ID=$PROJECT_ID"]
29+
env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"]
3030
args:
3131
- gae
3232
- --image=$_TEST_SERVER_IMAGE
3333
- --runtime=python
34+
- --skip-cleanup
3435

3536
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3637
timeout: 20m
3738
substitutions:
38-
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0
39+
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0
3940
_TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}
41+
42+
options:
43+
# Notify for Cloud Build async cleanup trigger
44+
pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup

‎cloudbuild-e2e-gce.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,18 @@ steps:
2626
- name: $_TEST_RUNNER_IMAGE
2727
id: run-tests-gce
2828
dir: /
29-
env: ["PROJECT_ID=$PROJECT_ID"]
29+
env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"]
3030
args:
3131
- gce
3232
- --image=$_TEST_SERVER_IMAGE
3333
- --health-check-timeout=5m
34+
- --skip-cleanup
3435

3536
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3637
substitutions:
37-
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0
38+
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0
3839
_TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}
40+
41+
options:
42+
# Notify for Cloud Build async cleanup trigger
43+
pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup

‎cloudbuild-e2e-gke.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,17 @@ steps:
2525
- name: $_TEST_RUNNER_IMAGE
2626
id: run-tests-gke
2727
dir: /
28-
env: ["PROJECT_ID=$PROJECT_ID"]
28+
env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"]
2929
args:
3030
- gke
3131
- --image=$_TEST_SERVER_IMAGE
32+
- --skip-cleanup
3233

3334
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
3435
substitutions:
35-
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0
36+
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0
3637
_TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}
38+
39+
options:
40+
# Notify for Cloud Build async cleanup trigger
41+
pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup

‎cloudbuild-e2e-local.yaml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,18 @@ steps:
3232
- name: $_TEST_RUNNER_IMAGE
3333
id: run-tests-local
3434
dir: /
35-
env: ["PROJECT_ID=$PROJECT_ID"]
35+
env: ["PROJECT_ID=$PROJECT_ID", "TEST_RUN_ID=$BUILD_ID"]
3636
args:
3737
- local
3838
- --image=$_TEST_SERVER_IMAGE
3939
- --network=cloudbuild
40+
- --skip-cleanup
4041

4142
logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs
4243
substitutions:
43-
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.21.0
44+
_TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.22.0
4445
_TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-python-e2e-test-server:${SHORT_SHA}
46+
47+
options:
48+
# Notify for Cloud Build async cleanup trigger
49+
pubsubTopic: projects/opentelemetry-ops-e2e/topics/e2e-cleanup

0 commit comments

Comments
 (0)