migrate kokoro builds to use new release image + use new release proj…

…ect to retrieve secrets (#3349)
GoogleCloudPlatform · Oct 31, 2024 · 6c1b039 · 6c1b039
1 parent 8e1ac39
commit 6c1b039
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg
@@ -9,7 +9,7 @@ build_file: "spring-cloud-gcp/.kokoro/trampoline.sh"
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java17"
+  value: "us-central1-docker.pkg.dev/cloud-sdk-release-custom-pool/release-images/java17"
 }
 
 before_action {

diff --git a/.kokoro/populate-secrets.sh b/.kokoro/populate-secrets.sh
@@ -20,8 +20,7 @@ function msg { println "$*" >&2 ;}
 function println { printf '%s\n' "$(now) $*" ;}
 
 
-# Populates requested secrets set in SECRET_MANAGER_KEYS from service account:
-# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com
+# Populates requested secrets set in SECRET_MANAGER_KEYS:
 SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager"
 msg "Creating folder on disk for secrets: ${SECRET_LOCATION}"
 mkdir -p ${SECRET_LOCATION}
@@ -32,7 +31,7 @@ do
     --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
     gcr.io/google.com/cloudsdktool/cloud-sdk \
     secrets versions access latest \
-    --project cloud-devrel-kokoro-resources \
+    --project cloud-sdk-release-custom-pool \
     --secret ${key} > \
     "${SECRET_LOCATION}/${key}"
   if [[ $? == 0 ]]; then

diff --git a/.kokoro/publish_javadoc.cfg b/.kokoro/publish_javadoc.cfg
@@ -1,11 +1,5 @@
 # Format: //devtools/kokoro/config/proto/build.proto
 
-# Configure the docker image for kokoro-trampoline
-env_vars: {
-  key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java17"
-}
-
 env_vars: {
   key: "TRAMPOLINE_BUILD_FILE"
   value: "github/spring-cloud-gcp/.kokoro/publish_javadoc.sh"