From 5ff24f24c4a312ea8ed6753d0ce3e6968ddc6748 Mon Sep 17 00:00:00 2001 From: Aaron Abbott Date: Thu, 15 Aug 2024 11:28:02 -0400 Subject: [PATCH] chore: migrate e2e tests Container Registry usage to Artifact Registry (#743) --- cloudbuild-e2e-cloud-functions-gen2.yaml | 4 ++-- cloudbuild-e2e-cloud-run.yaml | 4 ++-- cloudbuild-e2e-gae-standard.yaml | 4 ++-- cloudbuild-e2e-gae.yaml | 4 ++-- cloudbuild-e2e-gce.yaml | 4 ++-- cloudbuild-e2e-gke.yaml | 4 ++-- cloudbuild-e2e-image.yaml | 2 +- cloudbuild-e2e-local.yaml | 10 ++++++++-- e2e-test-server/wait-for-image.sh | 11 ++++------- 9 files changed, 25 insertions(+), 22 deletions(-) diff --git a/cloudbuild-e2e-cloud-functions-gen2.yaml b/cloudbuild-e2e-cloud-functions-gen2.yaml index 3a1d3637..02deeefd 100644 --- a/cloudbuild-e2e-cloud-functions-gen2.yaml +++ b/cloudbuild-e2e-cloud-functions-gen2.yaml @@ -52,5 +52,5 @@ steps: logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs timeout: 20m substitutions: - _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.19.0 - _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.20.1 + _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} diff --git a/cloudbuild-e2e-cloud-run.yaml b/cloudbuild-e2e-cloud-run.yaml index 96ac2d25..d98b02a9 100644 --- a/cloudbuild-e2e-cloud-run.yaml +++ b/cloudbuild-e2e-cloud-run.yaml @@ -33,5 +33,5 @@ steps: logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs timeout: 20m substitutions: - _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.19.0 - _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.20.1 + _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} diff --git a/cloudbuild-e2e-gae-standard.yaml b/cloudbuild-e2e-gae-standard.yaml index 752c5592..cd110c32 100644 --- a/cloudbuild-e2e-gae-standard.yaml +++ b/cloudbuild-e2e-gae-standard.yaml @@ -49,5 +49,5 @@ steps: logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs timeout: 20m substitutions: - _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:gae-standard-test-0 - _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.20.1 + _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} diff --git a/cloudbuild-e2e-gae.yaml b/cloudbuild-e2e-gae.yaml index a3b6e1a6..54f1d9a8 100644 --- a/cloudbuild-e2e-gae.yaml +++ b/cloudbuild-e2e-gae.yaml @@ -35,5 +35,5 @@ steps: logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs timeout: 20m substitutions: - _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.19.0 - _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.20.1 + _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} diff --git a/cloudbuild-e2e-gce.yaml b/cloudbuild-e2e-gce.yaml index e5b1edfc..618b99c8 100644 --- a/cloudbuild-e2e-gce.yaml +++ b/cloudbuild-e2e-gce.yaml @@ -35,5 +35,5 @@ steps: logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs timeout: 20m substitutions: - _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.19.0 - _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.20.1 + _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} diff --git a/cloudbuild-e2e-gke.yaml b/cloudbuild-e2e-gke.yaml index f99dcec5..41ee8b58 100644 --- a/cloudbuild-e2e-gke.yaml +++ b/cloudbuild-e2e-gke.yaml @@ -33,5 +33,5 @@ steps: logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs timeout: 20m substitutions: - _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.19.0 - _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.20.1 + _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} diff --git a/cloudbuild-e2e-image.yaml b/cloudbuild-e2e-image.yaml index 3dbf7fc8..f53e479d 100644 --- a/cloudbuild-e2e-image.yaml +++ b/cloudbuild-e2e-image.yaml @@ -29,4 +29,4 @@ steps: images: ["${_TEST_SERVER_IMAGE_NAME}"] logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs substitutions: - _TEST_SERVER_IMAGE_NAME: gcr.io/${PROJECT_ID}/opentelemetry-operations-js-e2e-test-server + _TEST_SERVER_IMAGE_NAME: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-js-e2e-test-server diff --git a/cloudbuild-e2e-local.yaml b/cloudbuild-e2e-local.yaml index cb102a80..c90dd511 100644 --- a/cloudbuild-e2e-local.yaml +++ b/cloudbuild-e2e-local.yaml @@ -22,6 +22,12 @@ steps: args: - e2e-test-server/wait-for-image.sh + - name: "docker" + id: pull-image + args: + - pull + - $_TEST_SERVER_IMAGE + # Run the test - name: $_TEST_RUNNER_IMAGE id: run-tests-local @@ -35,5 +41,5 @@ steps: logsBucket: gs://opentelemetry-ops-e2e-cloud-build-logs timeout: 20m substitutions: - _TEST_RUNNER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-e2e-testing:0.19.0 - _TEST_SERVER_IMAGE: gcr.io/${PROJECT_ID}/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} + _TEST_RUNNER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-e2e-testing:0.20.1 + _TEST_SERVER_IMAGE: us-central1-docker.pkg.dev/${PROJECT_ID}/e2e-testing/opentelemetry-operations-js-e2e-test-server:${SHORT_SHA} diff --git a/e2e-test-server/wait-for-image.sh b/e2e-test-server/wait-for-image.sh index e46ced4c..d9817df1 100755 --- a/e2e-test-server/wait-for-image.sh +++ b/e2e-test-server/wait-for-image.sh @@ -15,14 +15,11 @@ # limitations under the License. while true; do - docker pull $_TEST_SERVER_IMAGE - pull_success=$? - - if [ $pull_success -ne 0 ]; then - echo "Image couldn't be pulled yet, will continue to retry" - else - echo "Image pulled successfully, continuing onto test" + if docker manifest inspect ${_TEST_SERVER_IMAGE} > /dev/null; then + echo "Image is available, continuing onto test" break + else + echo "Image not available yet, will continue to retry" fi sleep 5 done