From 7512735b6e1ef96a13a8c736b5927a2dc04f4e7c Mon Sep 17 00:00:00 2001 From: Release Bot <107104610+sourcegraph-release-bot@users.noreply.github.com> Date: Thu, 7 Aug 2025 03:12:51 +0200 Subject: [PATCH 1/2] [Backport 6.6.x] fix: update internal registry from legacy to new revamp registry (#1261) ## Problem The release creation process was failing with 404 errors when trying to fetch images like cadvisor:6.6.2517 from the legacy internal registry. ## Root Cause Recent changes in the main sourcegraph repo migrated from legacy registries to new 'revamp' registries, but the deploy repos were still hardcoded to use the old registry. ## Solution - Replace `us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal` with `us-docker.pkg.dev/sourcegraph-images/internal` - Updated both release.yaml and batch-change/release.yaml - Tested and confirmed images exist in the new registry ## Test Plan - Validated that cadvisor:6.6.2517 exists in new registry but not in old registry - Successfully tested sg ops update-images command with new registry - Confirmed this fixes the original 404 errors during release creation
Backport 5b81ee7a33b721727aae92b03fdc7044f1b3f691 from #1260 Co-authored-by: Warren Gifford Co-authored-by: Amp --- batch-change/release.yaml | 12 ++++++------ release.yaml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/batch-change/release.yaml b/batch-change/release.yaml index b67e8e3a..61deea27 100644 --- a/batch-change/release.yaml +++ b/batch-change/release.yaml @@ -32,34 +32,34 @@ internal: - name: docker(compose):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../docker-compose/ - name: docker(shell):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind pure-docker --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../pure-docker/ minor: - name: docker(compose):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../docker-compose/ - name: docker(shell):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind pure-docker --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../pure-docker/ major: - name: docker(compose):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../docker-compose/ - name: docker(shell):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind pure-docker --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD ../pure-docker/ finalize: steps: diff --git a/release.yaml b/release.yaml index 2393e9fb..ac3a782a 100644 --- a/release.yaml +++ b/release.yaml @@ -31,12 +31,12 @@ internal: - name: docker(compose):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/ - name: docker(shell):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind shell --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD pure-docker/ - name: "git:branch" cmd: | @@ -57,12 +57,12 @@ internal: - name: docker(compose):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/ - name: docker(shell):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind shell --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD pure-docker/ - name: "git:branch" cmd: | @@ -83,12 +83,12 @@ internal: - name: docker(compose):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind compose --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD docker-compose/ - name: docker(shell):tags cmd: | set -eu - registry=us-central1-docker.pkg.dev/sourcegraph-ci/rfc795-internal + registry=us-docker.pkg.dev/sourcegraph-images/internal sg ops update-images --registry ${registry} --kind shell --pin-tag {{inputs.server.tag}} --docker-username $DOCKER_USERNAME --docker-password $DOCKER_PASSWORD pure-docker/ - name: "git:branch" cmd: | From f19d2efc5100384071cb2989cb39e1997014152f Mon Sep 17 00:00:00 2001 From: William Bezuidenhout Date: Thu, 7 Aug 2025 18:13:40 +0200 Subject: [PATCH 2/2] chore(ci): fetch docker username and password and update docker registry auth (#1264) Set docker username and fetch the password before running docker tests ### Test plan CI --- .buildkite/vagrant-run.sh | 2 ++ test/smoke-test.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.buildkite/vagrant-run.sh b/.buildkite/vagrant-run.sh index 06355a43..a54aeb97 100755 --- a/.buildkite/vagrant-run.sh +++ b/.buildkite/vagrant-run.sh @@ -26,6 +26,8 @@ if [ ! -f ${KEY_PATH} ]; then gcloud secrets versions access latest --secret=e2e-builder-sa-key --quiet --project=sourcegraph-ci > "${KEY_PATH}" fi export GOOGLE_JSON_KEY_LOCATION="${KEY_PATH}" +export DOCKER_USERNAME=sourcegraph +export DOCKER_PASSWORD="$(gcloud secrets versions access latest --secret=DOCKER_PASSWORD_BUILDKITE_AGENT --quiet --project=sourcegraph-ci)" echo --- ":vagrant: starting box $box" vagrant up "$box" --provider=google || exit_code=$? diff --git a/test/smoke-test.sh b/test/smoke-test.sh index 6526aa8e..a78cde2a 100755 --- a/test/smoke-test.sh +++ b/test/smoke-test.sh @@ -2,11 +2,13 @@ set -euxfo pipefail configure_docker() { + set +x if [ -n "${DOCKER_USERNAME}" ] && [ -n "${DOCKER_PASSWORD}" ]; then docker login -u "${DOCKER_USERNAME}" --password-stdin <<<"$DOCKER_PASSWORD" fi + set -x gcloud auth configure-docker - gcloud auth configure-docker us-central1-docker.pkg.dev + gcloud auth configure-docker us-central1-docker.pkg.dev,us-docker.pkg.dev } deploy_sourcegraph() {