diff mbox series

[3/3] CI: Clean up and re-enable testing on Fedora rawhide

Message ID 20220506144807.230013-4-fbarrat@linux.ibm.com
State Accepted
Headers show
Series CI refresh | expand

Checks

Context Check Description
snowpatch_ozlabs/github-Docker_builds_and_checks fail 3 of 9 jobs failed.

Commit Message

Frederic Barrat May 6, 2022, 2:48 p.m. UTC 
Testing on rawhide somehow vanished when we converted to github
actions. This patch cleans up the related CI files and re-enables it.

Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
---
 .github/workflows/docker-builds-checks.yml |  2 +-
 opal-ci/Dockerfile-fedora-rawhide          |  9 +++++----
 opal-ci/build-fedora-rawhide.sh            | 23 +++++++++++++++++++++-
 3 files changed, 28 insertions(+), 6 deletions(-)
 mode change 120000 => 100755 opal-ci/build-fedora-rawhide.sh
diff mbox series

Patch

diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml
index f5d64784..651bcb80 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, docs ]
+        os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, ubuntu-rolling, centos7, fedora34, fedora35, fedora-rawhide, docs ]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/opal-ci/Dockerfile-fedora-rawhide b/opal-ci/Dockerfile-fedora-rawhide
index bf959045..4a31ae0a 100644
--- a/opal-ci/Dockerfile-fedora-rawhide
+++ b/opal-ci/Dockerfile-fedora-rawhide
@@ -1,9 +1,10 @@ 
 FROM fedora:rawhide
-RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl openssl-devel
-RUN dnf -y install gcc-powerpc64-linux-gnu mbedtls-devel
-# below packages are for building dtc
-RUN dnf -y install flex bison
+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-fedora-rawhide.sh b/opal-ci/build-fedora-rawhide.sh
deleted file mode 120000
index dfeee1f1..00000000
--- a/opal-ci/build-fedora-rawhide.sh
+++ /dev/null
@@ -1 +0,0 @@ 
-build-fedora33.sh
\ No newline at end of file
diff --git a/opal-ci/build-fedora-rawhide.sh b/opal-ci/build-fedora-rawhide.sh
new file mode 100755
index 00000000..7c607a1f
--- /dev/null
+++ b/opal-ci/build-fedora-rawhide.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