Skip to content

Commit 0a1fd77

Browse files
authored
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
1 parent 5b81ee7 commit 0a1fd77

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

.buildkite/vagrant-run.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ if [ ! -f ${KEY_PATH} ]; then
2626
gcloud secrets versions access latest --secret=e2e-builder-sa-key --quiet --project=sourcegraph-ci > "${KEY_PATH}"
2727
fi
2828
export GOOGLE_JSON_KEY_LOCATION="${KEY_PATH}"
29+
export DOCKER_USERNAME=sourcegraph
30+
export DOCKER_PASSWORD="$(gcloud secrets versions access latest --secret=DOCKER_PASSWORD_BUILDKITE_AGENT --quiet --project=sourcegraph-ci)"
2931

3032
echo --- ":vagrant: starting box $box"
3133
vagrant up "$box" --provider=google || exit_code=$?

test/smoke-test.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
set -euxfo pipefail
33

44
configure_docker() {
5+
set +x
56
if [ -n "${DOCKER_USERNAME}" ] && [ -n "${DOCKER_PASSWORD}" ]; then
67
docker login -u "${DOCKER_USERNAME}" --password-stdin <<<"$DOCKER_PASSWORD"
78
fi
9+
set -x
810
gcloud auth configure-docker
9-
gcloud auth configure-docker us-central1-docker.pkg.dev
11+
gcloud auth configure-docker us-central1-docker.pkg.dev,us-docker.pkg.dev
1012
}
1113

1214
deploy_sourcegraph() {

0 commit comments

Comments
 (0)