From 2f5f809bd090057de7f234ffe86a63ee8cf53e1c Mon Sep 17 00:00:00 2001 From: Chi Zhang Date: Sun, 18 Oct 2026 07:51:20 +0000 Subject: [PATCH] androidify: Add docker container properties and any required script updates for Kokoro Instances migration, see go/kokoro-instances and go/kokoro-instances-migration for more details. --- build_presubmit_mobile.sh | 4 ++-- build_presubmit_wear.sh | 4 ++-- build_release_mobile.sh | 4 ++-- build_release_wear.sh | 4 ++-- kokoro/gcp_ubuntu_docker/continuous.cfg | 4 ++++ kokoro/gcp_ubuntu_docker/continuous_wear.cfg | 4 ++++ kokoro/gcp_ubuntu_docker/presubmit.cfg | 4 ++++ kokoro/gcp_ubuntu_docker/presubmit_wear.cfg | 4 ++++ kokoro/gcp_ubuntu_docker/release.cfg | 4 ++++ kokoro/gcp_ubuntu_docker/release_wear.cfg | 4 ++++ 10 files changed, 32 insertions(+), 8 deletions(-) diff --git a/build_presubmit_mobile.sh b/build_presubmit_mobile.sh index c224f08b..56c75f5e 100755 --- a/build_presubmit_mobile.sh +++ b/build_presubmit_mobile.sh @@ -77,11 +77,11 @@ echo "INFO: Accepting licenses for newly installed packages..." yes | sdkmanager --licenses echo "Copying google-services.json" -cp /tmpfs/src/git/androidify-prebuilts/google-services.json ${DIR}/app +cp "${KOKORO_ARTIFACTS_DIR}/git/androidify-prebuilts/google-services.json" ${DIR}/app echo "Copying gradle.properties" echo "" >> ${DIR}/gradle.properties # add a new line to the file -cat /tmpfs/src/git/androidify-prebuilts/gradle.properties >> ${DIR}/gradle.properties +cat "${KOKORO_ARTIFACTS_DIR}/git/androidify-prebuilts/gradle.properties" >> ${DIR}/gradle.properties ls # --- Build Process --- diff --git a/build_presubmit_wear.sh b/build_presubmit_wear.sh index 54edfab0..78f627d7 100755 --- a/build_presubmit_wear.sh +++ b/build_presubmit_wear.sh @@ -77,11 +77,11 @@ echo "INFO: Accepting licenses for newly installed packages..." yes | sdkmanager --licenses echo "Copying google-services.json" -cp /tmpfs/src/git/androidify-prebuilts/google-services.json ${DIR}/app +cp "${KOKORO_ARTIFACTS_DIR}/git/androidify-prebuilts/google-services.json" ${DIR}/app echo "Copying gradle.properties" echo "" >> ${DIR}/gradle.properties # add a new line to the file -cat /tmpfs/src/git/androidify-prebuilts/gradle.properties >> ${DIR}/gradle.properties +cat "${KOKORO_ARTIFACTS_DIR}/git/androidify-prebuilts/gradle.properties" >> ${DIR}/gradle.properties ls # --- Build Process --- diff --git a/build_release_mobile.sh b/build_release_mobile.sh index 9aa8c7c3..f38bdfc8 100755 --- a/build_release_mobile.sh +++ b/build_release_mobile.sh @@ -76,11 +76,11 @@ echo "INFO: Accepting licenses for newly installed packages..." yes | sdkmanager --licenses echo "Copying google-services.json" -cp /tmpfs/src/git/androidify-prebuilts/google-services.json ${DIR}/app +cp "${KOKORO_ARTIFACTS_DIR}/git/androidify-prebuilts/google-services.json" ${DIR}/app echo "Copying gradle.properties" echo "" >> ${DIR}/gradle.properties # add a new line to the file -cat /tmpfs/src/git/androidify-prebuilts/gradle.properties >> ${DIR}/gradle.properties +cat "${KOKORO_ARTIFACTS_DIR}/git/androidify-prebuilts/gradle.properties" >> ${DIR}/gradle.properties # --- Build Process --- diff --git a/build_release_wear.sh b/build_release_wear.sh index d8f944ba..ebb1c24e 100755 --- a/build_release_wear.sh +++ b/build_release_wear.sh @@ -76,11 +76,11 @@ echo "INFO: Accepting licenses for newly installed packages..." yes | sdkmanager --licenses echo "Copying google-services.json" -cp /tmpfs/src/git/androidify-prebuilts/google-services.json ${DIR}/app +cp "${KOKORO_ARTIFACTS_DIR}/git/androidify-prebuilts/google-services.json" ${DIR}/app echo "Copying gradle.properties" echo "" >> ${DIR}/gradle.properties # add a new line to the file -cat /tmpfs/src/git/androidify-prebuilts/gradle.properties >> ${DIR}/gradle.properties +cat "${KOKORO_ARTIFACTS_DIR}/git/androidify-prebuilts/gradle.properties" >> ${DIR}/gradle.properties # --- Build Process --- diff --git a/kokoro/gcp_ubuntu_docker/continuous.cfg b/kokoro/gcp_ubuntu_docker/continuous.cfg index ad98da38..2884d858 100644 --- a/kokoro/gcp_ubuntu_docker/continuous.cfg +++ b/kokoro/gcp_ubuntu_docker/continuous.cfg @@ -1,5 +1,9 @@ build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_build_mobile_release.sh" +container_properties { + docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current" +} + action { define_artifacts { regex: "artifacts/**.aab" diff --git a/kokoro/gcp_ubuntu_docker/continuous_wear.cfg b/kokoro/gcp_ubuntu_docker/continuous_wear.cfg index df102028..8f62cf6b 100644 --- a/kokoro/gcp_ubuntu_docker/continuous_wear.cfg +++ b/kokoro/gcp_ubuntu_docker/continuous_wear.cfg @@ -1,5 +1,9 @@ build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_build_wear_release.sh" +container_properties { + docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current" +} + action { define_artifacts { regex: "artifacts/**.aab" diff --git a/kokoro/gcp_ubuntu_docker/presubmit.cfg b/kokoro/gcp_ubuntu_docker/presubmit.cfg index e1f2ff38..244c7899 100644 --- a/kokoro/gcp_ubuntu_docker/presubmit.cfg +++ b/kokoro/gcp_ubuntu_docker/presubmit.cfg @@ -1,5 +1,9 @@ build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_build_mobile_presubmit.sh" +container_properties { + docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current" +} + action { define_artifacts { regex: "artifacts/**.aab" diff --git a/kokoro/gcp_ubuntu_docker/presubmit_wear.cfg b/kokoro/gcp_ubuntu_docker/presubmit_wear.cfg index 73f515e0..4ff44591 100644 --- a/kokoro/gcp_ubuntu_docker/presubmit_wear.cfg +++ b/kokoro/gcp_ubuntu_docker/presubmit_wear.cfg @@ -1,5 +1,9 @@ build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_build_wear_presubmit.sh" +container_properties { + docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current" +} + action { define_artifacts { regex: "artifacts/**.aab" diff --git a/kokoro/gcp_ubuntu_docker/release.cfg b/kokoro/gcp_ubuntu_docker/release.cfg index 75ecea4a..f6494a87 100644 --- a/kokoro/gcp_ubuntu_docker/release.cfg +++ b/kokoro/gcp_ubuntu_docker/release.cfg @@ -1,5 +1,9 @@ build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_build_mobile_release.sh" +container_properties { + docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current" +} + action { define_artifacts { regex: "artifacts/**.aab" diff --git a/kokoro/gcp_ubuntu_docker/release_wear.cfg b/kokoro/gcp_ubuntu_docker/release_wear.cfg index 53dac07f..4a2f47dd 100644 --- a/kokoro/gcp_ubuntu_docker/release_wear.cfg +++ b/kokoro/gcp_ubuntu_docker/release_wear.cfg @@ -1,5 +1,9 @@ build_file: "androidify/kokoro/gcp_ubuntu_docker/kokoro_build_wear_release.sh" +container_properties { + docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2004/full:current" +} + action { define_artifacts { regex: "artifacts/**.aab"