From 2106092e63ef24bbabb1ecfd04972acd4e1ca1a4 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Fri, 1 Mar 2024 09:42:24 +0000 Subject: [PATCH] ci/android: use a specific version of android-cuttlefish Using whatever version is the latest at the time of the image build is bad practice from a stability & reproducibility point of view, and the latest version is currently broken, preventing any change that rebuilds the android image from being merged. Part-of: --- .gitlab-ci/container/debian/x86_64_test-android.sh | 8 +++++++- .gitlab-ci/image-tags.yml | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/container/debian/x86_64_test-android.sh b/.gitlab-ci/container/debian/x86_64_test-android.sh index e2563c3981e..a3b026c8e94 100644 --- a/.gitlab-ci/container/debian/x86_64_test-android.sh +++ b/.gitlab-ci/container/debian/x86_64_test-android.sh @@ -74,8 +74,14 @@ popd ############### Building and installing Debian package ... -git clone --depth 1 https://github.com/google/android-cuttlefish.git +ANDROID_CUTTLEFISH_VERSION=f6494d9fbeaa9974b56923e3029909e5d5f440dd + +mkdir android-cuttlefish pushd android-cuttlefish +git init +git remote add origin https://github.com/google/android-cuttlefish.git +git fetch --depth 1 origin "$ANDROID_CUTTLEFISH_VERSION" +git checkout FETCH_HEAD pushd base dpkg-buildpackage -uc -us diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index b240d113fa6..7bac33dc982 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -24,7 +24,7 @@ variables: DEBIAN_X86_64_TEST_IMAGE_VK_PATH: "debian/x86_64_test-vk" DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" - DEBIAN_X86_64_TEST_ANDROID_TAG: "20240124-split" + DEBIAN_X86_64_TEST_ANDROID_TAG: "20240301-cuttlefish" DEBIAN_X86_64_TEST_GL_TAG: "20240223-piglit-2a" DEBIAN_X86_64_TEST_VK_TAG: "20240223-piglit-2a" ALPINE_X86_64_BUILD_TAG: "20240208-libclc-5"