diff options
| -rw-r--r-- | .azure-pipelines.yml | 11 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 15 | ||||
| -rw-r--r-- | tools/docker/Dockerfile | 14 |
3 files changed, 20 insertions, 20 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 966a66ff567..8209d2b329c 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -2,7 +2,7 @@ variables: windows_vm: windows-2022 ubuntu_vm: ubuntu-24.04 macos_vm: macOS-14 - ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20250404-29Apr2025 + ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20250714-25Jul2025 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root. @@ -531,10 +531,11 @@ stages: TEST_PY_BD: "r2dplus" TEST_PY_ID: "--id tulip_qemu" TEST_PY_TEST_SPEC: "not sleep" - sifive_unleashed_sdcard: - TEST_PY_BD: "sifive_unleashed" - TEST_PY_ID: "--id sdcard_qemu" - TEST_PY_TEST_SPEC: "not sleep" +# This is broken upsteam: https://gitlab.com/qemu-project/qemu/-/issues/2945 +# sifive_unleashed_sdcard: +# TEST_PY_BD: "sifive_unleashed" +# TEST_PY_ID: "--id sdcard_qemu" +# TEST_PY_TEST_SPEC: "not sleep" sifive_unleashed_spi-nor: TEST_PY_BD: "sifive_unleashed" TEST_PY_ID: "--id spi-nor_qemu" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2dfeda9985d..85401d3e09b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,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-20250404-29Apr2025 +image: ${MIRROR_DOCKER}/trini/u-boot-gitlab-ci-runner:jammy-20250714-25Jul2025 # We run some tests in different order, to catch some failures quicker. stages: @@ -519,12 +519,13 @@ r2dplus_tulip test.py: TEST_PY_ID: "--id tulip_qemu" <<: *buildman_and_testpy_dfn -sifive_unleashed_sdcard test.py: - variables: - TEST_PY_BD: "sifive_unleashed" - TEST_PY_TEST_SPEC: "not sleep" - TEST_PY_ID: "--id sdcard_qemu" - <<: *buildman_and_testpy_dfn +# This is broken upsteam: https://gitlab.com/qemu-project/qemu/-/issues/2945 +#sifive_unleashed_sdcard test.py: +# variables: +# TEST_PY_BD: "sifive_unleashed" +# TEST_PY_TEST_SPEC: "not sleep" +# TEST_PY_ID: "--id sdcard_qemu" +# <<: *buildman_and_testpy_dfn sifive_unleashed_spi-nor test.py: variables: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index ceb7a25ad4d..5b4c75f8400 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,7 +2,7 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. -FROM ubuntu:jammy-20250404 +FROM ubuntu:jammy-20250714 LABEL org.opencontainers.image.authors="Tom Rini <trini@konsulko.com>" LABEL org.opencontainers.image.description=" This image is for building U-Boot inside a container" @@ -125,6 +125,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ python3-dev \ python3-pip \ python3-sphinx \ + python3-tomli \ python3-venv \ rpm2cpio \ sbsigntool \ @@ -218,13 +219,10 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ - git checkout v8.2.0 && \ + git checkout v10.0.2 && \ # config user.name and user.email to make 'git am' happy git config user.name u-boot && \ git config user.email u-boot@denx.de && \ - git format-patch 0c7ffc977195~..0c7ffc977195 && \ - git am 0001-hw-net-cadence_gem-Fix-MDIO_OP_xxx-values.patch && \ - git cherry-pick d3c79c3974 && \ ./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,m68k-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,ppc-softmmu,riscv32-softmmu,riscv64-softmmu,sh4-softmmu,x86_64-softmmu,xtensa-softmmu" && \ make -j$(nproc) all install && \ rm -rf /tmp/qemu @@ -294,8 +292,8 @@ RUN mkdir /tmp/trace && \ rm -rf /tmp/trace # Build coreboot -RUN wget -O - https://coreboot.org/releases/coreboot-24.08.tar.xz | tar -C /tmp -xJ && \ - cd /tmp/coreboot-24.08 && \ +RUN wget -O - https://coreboot.org/releases/coreboot-25.03.tar.xz | tar -C /tmp -xJ && \ + cd /tmp/coreboot-25.03 && \ make crossgcc-i386 CPUS=$(nproc) && \ make -C payloads/coreinfo olddefconfig && \ make -C payloads/coreinfo && \ @@ -306,7 +304,7 @@ RUN wget -O - https://coreboot.org/releases/coreboot-24.08.tar.xz | tar -C /tmp make -j $(nproc) && \ sudo mkdir /opt/coreboot && \ sudo cp build/coreboot.rom build/cbfstool /opt/coreboot/ && \ - rm -rf /tmp/coreboot-24.08 + rm -rf /tmp/coreboot-25.03 # Create our user/group RUN echo uboot ALL=NOPASSWD: ALL > /etc/sudoers.d/uboot |