From 33a368ffaf28ca004f773b69819e950ec59dc540 Mon Sep 17 00:00:00 2001 From: Dennis Kempin Date: Tue, 26 Apr 2022 18:53:41 +0000 Subject: [PATCH] build-chromeos.sh: Use common.sh Re-use the existing logic to install python, setup the source and most importantly, enable SSH debugging. BUG=b:226975041 TEST=None Change-Id: I0f8b0251bea163145ba1611b3b36c4bb7c8ee968 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3606979 Reviewed-by: Dmitry Torokhov Tested-by: Dennis Kempin --- ci/kokoro/build-chromeos.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/ci/kokoro/build-chromeos.sh b/ci/kokoro/build-chromeos.sh index 4add32fa16..4adb06c6a7 100755 --- a/ci/kokoro/build-chromeos.sh +++ b/ci/kokoro/build-chromeos.sh @@ -11,6 +11,8 @@ set -ex +source "$(dirname $0)/common.sh" + CROS_ROOT="${KOKORO_ARTIFACTS_DIR}/cros" CROSVM_ROOT="${KOKORO_ARTIFACTS_DIR}/git/crosvm" DEPOT_TOOLS="${KOKORO_ARTIFACTS_DIR}/depot_tools" @@ -64,13 +66,6 @@ build_and_test_crosvm() { } main() { - # Ensure we have at least python 3.9. Kokoro requires us to use pyenv to install the required - # version. - if ! python3 -c "$VERSION_CHECK"; then - pyenv install --verbose --skip-existing 3.9.5 - pyenv global 3.9.5 - fi - mkdir -p "$CROS_ROOT" cd "$CROS_ROOT"