1
0
Fork 0

drm_hwcomposer: CI: Use 22.04 LTS for android container

Currently the android container is using 24.10 just to be consistent
with the aospless container, but since 24.10 is reaching end of life,
rebuild the android container with Ubuntu 22.04 for long-term support.

Ubuntu 22.04 is a better base than 24.04 because the cuttlefish support
packages expect older package versions.

Signed-off-by: Deborah Brouwer <deborah.brouwer@collabora.com>
This commit is contained in:
Deborah Brouwer 2025-06-04 16:18:08 -07:00
parent 542eed1478
commit 842681a9b6

View file

@ -35,8 +35,6 @@ debian/x86_64_cuttlefish:
extends:
- .fdo.container-build@ubuntu
- .container
variables:
FDO_DISTRIBUTION_VERSION: "24.10"
ubuntu/x86_64_aospless:
extends:
@ -56,6 +54,7 @@ ubuntu/x86_64_android:
ANDROID_CTS_MODULES: >-
CtsGraphicsTestCases
CtsDisplayTestCases
FDO_DISTRIBUTION_VERSION: "22.04"
FDO_DISTRIBUTION_EXEC: 'bash .ci/container/ubuntu/x86_64_android.sh'
HWC_TAG: $UBUNTU_ANDROID_TAG
after_script: