Skip to content

Commit

Permalink
fix: need to update to use new trampoline_release.py script as well a…
Browse files Browse the repository at this point in the history
…s update to configure docker auth with new image (#3356)

* fix: need to update to use new trampoline_release script

* temp d not do any of the actual values, just testing

* revert testing release

* add better comment for docker auth logic

* add better comment for docker auth logic

* add back trampoline image for publish_javadoc.cfg, it isn't reading the common.cfg value
  • Loading branch information
ldetmer authored Nov 1, 2024
1 parent 9cf2145 commit b5ace26
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .kokoro/publish_javadoc.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ env_vars: {
value: "github/spring-cloud-gcp/.kokoro/publish_javadoc.sh"
}

env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "us-central1-docker.pkg.dev/cloud-sdk-release-custom-pool/release-images/java17"
}

before_action {
fetch_keystore {
keystore_resource {
Expand Down
11 changes: 10 additions & 1 deletion .kokoro/trampoline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,13 @@ function cleanup() {
trap cleanup EXIT

$(dirname $0)/populate-secrets.sh # Secret Manager secrets.
python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"
TRAMPOLINE_HOST=$(echo "${TRAMPOLINE_IMAGE}" | cut -d/ -f1)
if [[ ! "${TRAMPOLINE_HOST}" =~ "gcr.io" ]]; then
# You have to run on an update version of gcloud, in order to pass in the host name in
# configure-docker command. This is not necessary for gcr.io because that is a default
# repository name and is not required to specify the repo when running configure-docker.
echo "TRAMPOLINE_HOST: ${TRAMPOLINE_HOST}"
gcloud components update
gcloud auth configure-docker "${TRAMPOLINE_HOST}"
fi
python3 "${KOKORO_GFILE_DIR}/trampoline_release.py"

0 comments on commit b5ace26

Please sign in to comment.