[Skiboot] [PATCH] opal-ci: Drop fedora34, add fedora36

Reza Arbab arbab at linux.ibm.com
Wed Jun 8 06:44:11 AEST 2022


Fedora 34 has reached end-of-life. Remove it and add Fedora 36.

Signed-off-by: Reza Arbab <arbab at linux.ibm.com>
---
 .github/workflows/docker-builds-checks.yml           | 2 +-
 opal-ci/Dockerfile-docs                              | 2 +-
 opal-ci/{Dockerfile-fedora34 => Dockerfile-fedora36} | 5 +++--
 opal-ci/{build-fedora34.sh => build-fedora36.sh}     | 0
 4 files changed, 5 insertions(+), 4 deletions(-)
 rename opal-ci/{Dockerfile-fedora34 => Dockerfile-fedora36} (75%)
 rename opal-ci/{build-fedora34.sh => build-fedora36.sh} (100%)

diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml
index 651bcb80f05e..e6285d0d44e8 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 at v2
diff --git a/opal-ci/Dockerfile-docs b/opal-ci/Dockerfile-docs
index f96a5e12ab77..24238a77c5e2 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-fedora36
similarity index 75%
rename from opal-ci/Dockerfile-fedora34
rename to opal-ci/Dockerfile-fedora36
index 6cc1241cadca..af187f06e4d6 100644
--- a/opal-ci/Dockerfile-fedora34
+++ b/opal-ci/Dockerfile-fedora36
@@ -1,9 +1,10 @@
-FROM fedora:34
+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
+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-fedora36.sh
similarity index 100%
rename from opal-ci/build-fedora34.sh
rename to opal-ci/build-fedora36.sh
-- 
2.31.1



More information about the Skiboot mailing list