From 5dacf0f6dd66db14c9232722297fd6b12b8c7e45 Mon Sep 17 00:00:00 2001 From: Anas Sulaiman Date: Wed, 15 Nov 2023 20:22:31 +0000 Subject: [PATCH] fix RE for metalava actions Some of those actions use unzip which is not available in the source tree and needs to be installed in the container. Bug: b/309783005 Test: Ran an android build and verified there are no local fallbacks from metalava actions. Change-Id: I360c3fb30e2eacc0615ed636115bce011bff5bf3 --- core/rbe.mk | 2 +- rbesetup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/rbe.mk b/core/rbe.mk index 001a549b40..0f90ddd6f9 100644 --- a/core/rbe.mk +++ b/core/rbe.mk @@ -64,7 +64,7 @@ ifneq ($(filter-out false,$(USE_RBE)),) d8_exec_strategy := remote_local_fallback endif - platform := container-image=docker://gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:953fed4a6b2501256a0d17f055dc17884ff71b024e50ade773e0b348a6c303e6 + platform := container-image=docker://gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:1eb7f64b9e17102b970bd7a1af7daaebdb01c3fb777715899ef462d6c6d01a45 cxx_platform := $(platform),Pool=$(cxx_pool) java_r8_d8_platform := $(platform),Pool=$(java_pool) diff --git a/rbesetup.sh b/rbesetup.sh index 9e246ff02b..0da7a57647 100644 --- a/rbesetup.sh +++ b/rbesetup.sh @@ -34,7 +34,7 @@ fi # for the build to be executed with RBE. function use_rbe() { local RBE_BINARIES_DIR="prebuilts/remoteexecution-client/latest" - local DOCKER_IMAGE="gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:953fed4a6b2501256a0d17f055dc17884ff71b024e50ade773e0b348a6c303e6" + local DOCKER_IMAGE="gcr.io/androidbuild-re-dockerimage/android-build-remoteexec-image@sha256:1eb7f64b9e17102b970bd7a1af7daaebdb01c3fb777715899ef462d6c6d01a45" # Do not set an invocation-ID and let reproxy auto-generate one. USE_RBE="true" \