From 9420160a0d145be2e4b53742612fdf4fb43d11af Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 1 Nov 2025 09:32:01 -0600 Subject: CI: Move to Ubuntu 24.04 'Noble' as the base The changes here are that we need to ensure python setuptools are in our build virtual environments as they will no longer come in via python even in a virtual environment. As part of this ensure setuptools is in our cache and also include pytest-azurepipelines as we should have been doing. Next, we move away from using apt-key directly and move that stanza towards the rest of the apt work. This also lets us drop directly installing gnupg2. These steps are not strictly required for 24.04 but will be for later releases and are valid now. Finally, we drop the unused PTYHONPATH ENV line. In order to use these containers however, we need to stop running the event_dump test as the 'addr2line' tool provided by binutils no longer is able to decode those specific events in most cases. As this is a problem with binutils and present for some time now, disabling the test until someone has time to work with upstream this seems reasonable. Signed-off-by: Tom Rini --- .gitlab-ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5d7f4dc738..9422af2ebd0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ workflow: # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile -image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20251001-04Nov2025 +image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:noble-20251001-10Nov2025 # We run some tests in different order, to catch some failures quicker. stages: @@ -59,6 +59,7 @@ stages: . /tmp/venv/bin/activate; pip install -r test/py/requirements.txt -r tools/binman/requirements.txt -r tools/buildman/requirements.txt -r tools/u_boot_pylib/requirements.txt + setuptools after_script: - cp -v /tmp/${TEST_PY_BD}/*.{html,css,xml} . @@ -150,6 +151,7 @@ build all platforms in a single job: . /tmp/venv/bin/activate; pip install -r tools/binman/requirements.txt -r tools/buildman/requirements.txt + setuptools - ret=0; git config --global --add safe.directory "${CI_PROJECT_DIR}"; ./tools/buildman/buildman -o /tmp -PEWM -x xtensa || ret=$?; @@ -266,6 +268,8 @@ sandbox test.py: variables: TEST_PY_BD: "sandbox" TEST_PY_EXTRA: "--timing" + # addr2line in Ubuntu 'Noble' and later are broken. + TEST_PY_TEST_SPEC: "not event_dump" <<: *buildman_and_testpy_dfn sandbox with clang test.py: @@ -278,6 +282,8 @@ sandbox with clang test.py: variables: TEST_PY_BD: "sandbox" OVERRIDE: "-O clang-18" + # addr2line in Ubuntu 'Noble' and later are broken. + TEST_PY_TEST_SPEC: "not event_dump" <<: *buildman_and_testpy_dfn sandbox64 test.py: -- cgit v1.2.3