| Message ID | 20240802182943.179900-3-arbab@linux.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | opal-ci: Remove centos7 | expand |
On Fri, 2 Aug 2024 13:29:43 -0500 Reza Arbab <arbab@linux.ibm.com> wrote: > CentOS 7 end of life was June 30, 2024. > > Signed-off-by: Reza Arbab <arbab@linux.ibm.com> LGTM Reviewed-by: Dan Horák <dan@danny.cz> Dan > --- > .github/workflows/docker-builds-checks.yml | 2 +- > opal-ci/Dockerfile-centos7 | 13 --------- > opal-ci/build-centos7.sh | 32 ---------------------- > 3 files changed, 1 insertion(+), 46 deletions(-) > delete mode 100644 opal-ci/Dockerfile-centos7 > delete mode 100755 opal-ci/build-centos7.sh > > diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml > index ab57ca212afa..dd1339cd75ee 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, fedora39, fedora40, fedora-rawhide, docs ] > + os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, ubuntu-rolling, fedora39, fedora40, fedora-rawhide, docs ] > > steps: > - uses: actions/checkout@v3 > diff --git a/opal-ci/Dockerfile-centos7 b/opal-ci/Dockerfile-centos7 > deleted file mode 100644 > index 5055616c9a9a..000000000000 > --- a/opal-ci/Dockerfile-centos7 > +++ /dev/null > @@ -1,13 +0,0 @@ > -FROM centos:7 > -RUN yum -y update && yum clean all > -RUN yum -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel openssl mbedtls-devel > -RUN mkdir /opt/cross > -RUN if [ `arch` = "x86_64" ]; then wget https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.1.0/x86_64-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; tar -C /opt/cross -xf x86_64-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; fi > -RUN if [ `arch` = "ppc64le" ]; then wget https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/ppc64le/8.1.0/ppc64le-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; tar -C /opt/cross -xf ppc64le-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; fi > -RUN if [ `arch` = "x86_64" ]; then curl -L -O https://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8-1.0-2.el7.x86_64.rpm; yum install -y systemsim-p8-1.0-2.el7.x86_64.rpm; fi > -RUN if [ `arch` = "x86_64" ]; then curl -L -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.el7.x86_64.rpm; yum install -y systemsim-p9-1.0-0.el7.x86_64.rpm; fi > -RUN yum install -y flex bison > -RUN curl -L https://github.com/dgibson/dtc/archive/v1.4.2.tar.gz|tar xfz - > -RUN (cd dtc-1.4.2; make PREFIX=/usr/local install) > -COPY . /build/ > -WORKDIR /build > diff --git a/opal-ci/build-centos7.sh b/opal-ci/build-centos7.sh > deleted file mode 100755 > index 79b4c2e9b967..000000000000 > --- a/opal-ci/build-centos7.sh > +++ /dev/null > @@ -1,32 +0,0 @@ > -#!/bin/bash > - > -set -uo pipefail > -set -e > -set -vx > - > -# We're limited as to what we want to bother to run on CentOS7 > -# It's fairly old and some of the things (e.g. build+run qemu) we don't > -# want to bother doing. > -if [ $(arch) == "x86_64" ]; then > - export CROSS=/opt/cross/gcc-8.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- > -fi > -# Note that this doesn't work on centos7 because "/lib64/ld64.so.2: version `GLIBC_2.22' not found" > -if [ $(arch) == "ppc64le" ]; then > - export CROSS=/opt/cross/gcc-8.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- > -fi > - > -MAKE_J=$(grep -c processor /proc/cpuinfo) > - > -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 > -- > 2.43.5 > > _______________________________________________ > Skiboot mailing list > Skiboot@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/skiboot
On Fri, Aug 02, 2024 at 01:29:43PM -0500, Reza Arbab wrote:
>CentOS 7 end of life was June 30, 2024.
Applied to master.
diff --git a/.github/workflows/docker-builds-checks.yml b/.github/workflows/docker-builds-checks.yml index ab57ca212afa..dd1339cd75ee 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, fedora39, fedora40, fedora-rawhide, docs ] + os: [ ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, ubuntu-rolling, fedora39, fedora40, fedora-rawhide, docs ] steps: - uses: actions/checkout@v3 diff --git a/opal-ci/Dockerfile-centos7 b/opal-ci/Dockerfile-centos7 deleted file mode 100644 index 5055616c9a9a..000000000000 --- a/opal-ci/Dockerfile-centos7 +++ /dev/null @@ -1,13 +0,0 @@ -FROM centos:7 -RUN yum -y update && yum clean all -RUN yum -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel openssl mbedtls-devel -RUN mkdir /opt/cross -RUN if [ `arch` = "x86_64" ]; then wget https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/8.1.0/x86_64-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; tar -C /opt/cross -xf x86_64-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; fi -RUN if [ `arch` = "ppc64le" ]; then wget https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/ppc64le/8.1.0/ppc64le-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; tar -C /opt/cross -xf ppc64le-gcc-8.1.0-nolibc-powerpc64-linux.tar.xz; fi -RUN if [ `arch` = "x86_64" ]; then curl -L -O https://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8-1.0-2.el7.x86_64.rpm; yum install -y systemsim-p8-1.0-2.el7.x86_64.rpm; fi -RUN if [ `arch` = "x86_64" ]; then curl -L -O https://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0.el7.x86_64.rpm; yum install -y systemsim-p9-1.0-0.el7.x86_64.rpm; fi -RUN yum install -y flex bison -RUN curl -L https://github.com/dgibson/dtc/archive/v1.4.2.tar.gz|tar xfz - -RUN (cd dtc-1.4.2; make PREFIX=/usr/local install) -COPY . /build/ -WORKDIR /build diff --git a/opal-ci/build-centos7.sh b/opal-ci/build-centos7.sh deleted file mode 100755 index 79b4c2e9b967..000000000000 --- a/opal-ci/build-centos7.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -set -uo pipefail -set -e -set -vx - -# We're limited as to what we want to bother to run on CentOS7 -# It's fairly old and some of the things (e.g. build+run qemu) we don't -# want to bother doing. -if [ $(arch) == "x86_64" ]; then - export CROSS=/opt/cross/gcc-8.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- -fi -# Note that this doesn't work on centos7 because "/lib64/ld64.so.2: version `GLIBC_2.22' not found" -if [ $(arch) == "ppc64le" ]; then - export CROSS=/opt/cross/gcc-8.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- -fi - -MAKE_J=$(grep -c processor /proc/cpuinfo) - -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
CentOS 7 end of life was June 30, 2024. Signed-off-by: Reza Arbab <arbab@linux.ibm.com> --- .github/workflows/docker-builds-checks.yml | 2 +- opal-ci/Dockerfile-centos7 | 13 --------- opal-ci/build-centos7.sh | 32 ---------------------- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 opal-ci/Dockerfile-centos7 delete mode 100755 opal-ci/build-centos7.sh