From d365a01a0996136fae75c3080800be14632c98e8 Mon Sep 17 00:00:00 2001 From: Reza Arbab Date: Wed, 11 Jun 2025 10:03:29 -0500 Subject: opal-ci: Drop ubuntu-20.04, add ubuntu-24.04 Standard support for Ubuntu 20.04 ended on May 31, 2025. Remove it and add Ubuntu 24.04. Signed-off-by: Reza Arbab --- .github/workflows/docker-builds-checks.yml | 2 +- opal-ci/Dockerfile-ubuntu-20.04 | 10 ---------- opal-ci/Dockerfile-ubuntu-24.04 | 10 ++++++++++ opal-ci/build-ubuntu-20.04.sh | 31 ------------------------------ opal-ci/build-ubuntu-24.04.sh | 31 ++++++++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 opal-ci/Dockerfile-ubuntu-20.04 create mode 100644 opal-ci/Dockerfile-ubuntu-24.04 delete mode 100755 opal-ci/build-ubuntu-20.04.sh create mode 100755 opal-ci/build-ubuntu-24.04.sh diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml index 3a26df1..22fdbc8 100644 --- a/.github/workflows/docker-builds-checks.yml +++ b/.github/workflows/docker-builds-checks.yml @@ -12,7 +12,7 @@ jobs: fail-fast: false matrix: - os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-rolling, fedora41, fedora42, fedora-rawhide, docs ] + os: [ ubuntu-22.04, ubuntu-24.04, ubuntu-rolling, fedora41, fedora42, fedora-rawhide, docs ] steps: - uses: actions/checkout@v4 diff --git a/opal-ci/Dockerfile-ubuntu-20.04 b/opal-ci/Dockerfile-ubuntu-20.04 deleted file mode 100644 index 8333b12..0000000 --- a/opal-ci/Dockerfile-ubuntu-20.04 +++ /dev/null @@ -1,10 +0,0 @@ -FROM ubuntu:20.04 -ENV DEBIAN_FRONTEND noninteractive -RUN apt-get update -qq -RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu; fi -RUN apt-get install -y gcc-arm-linux-gnueabi || true -RUN apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 libmbedtls-dev -RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi -RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/ubuntu2004/systemsim-p10_1.2-1_amd64.deb; dpkg -i systemsim-p10_1.2-1_amd64.deb; fi -COPY . /build/ -WORKDIR /build diff --git a/opal-ci/Dockerfile-ubuntu-24.04 b/opal-ci/Dockerfile-ubuntu-24.04 new file mode 100644 index 0000000..18d4d83 --- /dev/null +++ b/opal-ci/Dockerfile-ubuntu-24.04 @@ -0,0 +1,10 @@ +FROM ubuntu:24.04 +ENV DEBIAN_FRONTEND noninteractive +RUN apt-get update -qq +RUN if [ `arch` != "ppc64le" ]; then apt-get install -y gcc-powerpc64le-linux-gnu; fi +RUN apt-get install -y gcc-arm-linux-gnueabi || true +RUN apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python3 g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 libmbedtls-dev +RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi +RUN if [ `arch` = "x86_64" ]; then curl -O https://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/ubuntu2004/systemsim-p10_1.2-1_amd64.deb; dpkg -i systemsim-p10_1.2-1_amd64.deb; fi +COPY . /build/ +WORKDIR /build diff --git a/opal-ci/build-ubuntu-20.04.sh b/opal-ci/build-ubuntu-20.04.sh deleted file mode 100755 index 48eb825..0000000 --- a/opal-ci/build-ubuntu-20.04.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -set -uo pipefail -set -e -set -vx - -MAKE_J=$(grep -c processor /proc/cpuinfo) - -export CROSS="ccache powerpc64le-linux-gnu-" - -make -j${MAKE_J} all -make -j${MAKE_J} check -(make clean; cd external/gard && CROSS= make -j${MAKE_J}) -# because some ppc64le versions don't have arm cross compiler -if which arm-linux-gnueabi-gcc; then - ( cd external/pflash; - echo "Building for ARM..." - make clean && make distclean - CROSS_COMPILE=arm-linux-gnueabi- make || { echo "ARM build failed"; exit 1; } - ) -fi -(cd external/pflash; make clean && make distclean && make) -make clean -SKIBOOT_GCOV=1 make -j${MAKE_J} -SKIBOOT_GCOV=1 make -j${MAKE_J} check - -make clean -rm -rf builddir -mkdir builddir -make SRC=$(pwd) -f ../Makefile -C builddir -j${MAKE_J} -make clean diff --git a/opal-ci/build-ubuntu-24.04.sh b/opal-ci/build-ubuntu-24.04.sh new file mode 100755 index 0000000..ba070b4 --- /dev/null +++ b/opal-ci/build-ubuntu-24.04.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -uo pipefail +set -e +set -vx + +MAKE_J=$(nproc) + +export CROSS="ccache powerpc64le-linux-gnu-" + +make -j${MAKE_J} all +make -j${MAKE_J} check +(make clean; cd external/gard && CROSS= make -j${MAKE_J}) +# because some ppc64le versions don't have arm cross compiler +if which arm-linux-gnueabi-gcc; then + ( cd external/pflash; + echo "Building for ARM..." + make clean && make distclean + CROSS_COMPILE=arm-linux-gnueabi- make || { echo "ARM build failed"; exit 1; } + ) +fi +(cd external/pflash; make clean && make distclean && make) +make clean +SKIBOOT_GCOV=1 make -j${MAKE_J} +SKIBOOT_GCOV=1 make -j${MAKE_J} check + +make clean +rm -rf builddir +mkdir builddir +make SRC=$(pwd) -f ../Makefile -C builddir -j${MAKE_J} +make clean -- cgit v1.1