From 5133e1efc9470781fb5ccf553460ecb8b3dccbc7 Mon Sep 17 00:00:00 2001 From: Reza Arbab Date: Tue, 7 Jun 2022 15:44:11 -0500 Subject: opal-ci: Drop fedora34, add fedora36 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fedora 34 has reached end-of-life. Remove it and add Fedora 36. Signed-off-by: Reza Arbab Reviewed-by: Frederic Barrat Reviewed-by: Dan Horák --- .github/workflows/docker-builds-checks.yml | 2 +- opal-ci/Dockerfile-docs | 2 +- opal-ci/Dockerfile-fedora34 | 9 --------- opal-ci/Dockerfile-fedora36 | 10 ++++++++++ opal-ci/build-fedora34.sh | 22 ---------------------- opal-ci/build-fedora36.sh | 22 ++++++++++++++++++++++ 6 files changed, 34 insertions(+), 33 deletions(-) delete mode 100644 opal-ci/Dockerfile-fedora34 create mode 100644 opal-ci/Dockerfile-fedora36 delete mode 100755 opal-ci/build-fedora34.sh create mode 100755 opal-ci/build-fedora36.sh diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml index 651bcb8..e6285d0 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-18.04, ubuntu-20.04, ubuntu-22.04, ubuntu-rolling, centos7, fedora34, fedora35, fedora-rawhide, docs ] + os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, ubuntu-rolling, centos7, fedora35, fedora36, fedora-rawhide, docs ] steps: - uses: actions/checkout@v2 diff --git a/opal-ci/Dockerfile-docs b/opal-ci/Dockerfile-docs index f96a5e1..24238a7 120000 --- a/opal-ci/Dockerfile-docs +++ b/opal-ci/Dockerfile-docs @@ -1 +1 @@ -Dockerfile-fedora34 \ No newline at end of file +Dockerfile-fedora35 \ No newline at end of file diff --git a/opal-ci/Dockerfile-fedora34 b/opal-ci/Dockerfile-fedora34 deleted file mode 100644 index 6cc1241..0000000 --- a/opal-ci/Dockerfile-fedora34 +++ /dev/null @@ -1,9 +0,0 @@ -FROM fedora:34 -RUN dnf -y update -RUN dnf -y install --allowerasing wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl openssl-devel gcc-powerpc64-linux-gnu mbedtls-devel -# for building documentation and the coverage report -RUN dnf -y install python-pip lcov -RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi -RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi -COPY . /build/ -WORKDIR /build diff --git a/opal-ci/Dockerfile-fedora36 b/opal-ci/Dockerfile-fedora36 new file mode 100644 index 0000000..af187f0 --- /dev/null +++ b/opal-ci/Dockerfile-fedora36 @@ -0,0 +1,10 @@ +FROM fedora:36 +RUN dnf -y update +RUN dnf -y install --allowerasing wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl openssl-devel gcc-powerpc64-linux-gnu mbedtls-devel which qemu-system-ppc +# for building documentation and the coverage report +RUN dnf -y install python-pip lcov +RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0.f22.x86_64.rpm; fi +RUN if [ `arch` = "x86_64" ]; then dnf -y install http://public.dhe.ibm.com/software/server/powerfuncsim/p10/packages/v1.2-1/rhel8/systemsim-p10-1.2-1.x86_64.rpm; fi +COPY . /build/ +WORKDIR /build +RUN curl -L -O https://github.com/open-power/op-build/releases/download/v2.7/zImage.epapr diff --git a/opal-ci/build-fedora34.sh b/opal-ci/build-fedora34.sh deleted file mode 100755 index 7c607a1..0000000 --- a/opal-ci/build-fedora34.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -uo pipefail -set -e -set -vx - -MAKE_J=$(nproc) -export CROSS="ccache powerpc64-linux-gnu-" - -make -j${MAKE_J} all -make -j${MAKE_J} check -(make clean; cd external/gard && CROSS= make -j${MAKE_J}) -(cd external/pflash; make -j${MAKE_J}) -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-fedora36.sh b/opal-ci/build-fedora36.sh new file mode 100755 index 0000000..7c607a1 --- /dev/null +++ b/opal-ci/build-fedora36.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +set -uo pipefail +set -e +set -vx + +MAKE_J=$(nproc) +export CROSS="ccache powerpc64-linux-gnu-" + +make -j${MAKE_J} all +make -j${MAKE_J} check +(make clean; cd external/gard && CROSS= make -j${MAKE_J}) +(cd external/pflash; make -j${MAKE_J}) +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