From a3b0ce167d6dc01fc158d965bf74eef74a44b49e Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Fri, 4 May 2018 16:34:13 +1000 Subject: travis: remove obsolete fedora 24,25,26 Signed-off-by: Stewart Smith --- opal-ci/Dockerfile-fedora-rawhide | 2 +- opal-ci/Dockerfile-fedora24 | 7 ------- opal-ci/Dockerfile-fedora25 | 7 ------- opal-ci/Dockerfile-fedora26 | 7 ------- opal-ci/Dockerfile-fedora27 | 2 +- opal-ci/build-fedora24.sh | 25 ------------------------- opal-ci/build-fedora27.sh | 25 +++++++++++++++++++++++++ 7 files changed, 27 insertions(+), 48 deletions(-) delete mode 100644 opal-ci/Dockerfile-fedora24 delete mode 100644 opal-ci/Dockerfile-fedora25 delete mode 100644 opal-ci/Dockerfile-fedora26 delete mode 100755 opal-ci/build-fedora24.sh create mode 100755 opal-ci/build-fedora27.sh (limited to 'opal-ci') diff --git a/opal-ci/Dockerfile-fedora-rawhide b/opal-ci/Dockerfile-fedora-rawhide index 7413a58..4bfdd57 100644 --- a/opal-ci/Dockerfile-fedora-rawhide +++ b/opal-ci/Dockerfile-fedora-rawhide @@ -4,4 +4,4 @@ RUN dnf -y install gcc-powerpc64-linux-gnu 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 COPY . /build/ WORKDIR /build -ENTRYPOINT ./opal-ci/build-fedora24.sh +ENTRYPOINT ./opal-ci/build-fedora27.sh diff --git a/opal-ci/Dockerfile-fedora24 b/opal-ci/Dockerfile-fedora24 deleted file mode 100644 index 06e1b0f..0000000 --- a/opal-ci/Dockerfile-fedora24 +++ /dev/null @@ -1,7 +0,0 @@ -FROM fedora:24 -RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel openssl -RUN dnf -y install gcc-powerpc64-linux-gnu -RUN 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 -COPY . /build/ -WORKDIR /build -ENTRYPOINT ./opal-ci/build-fedora24.sh diff --git a/opal-ci/Dockerfile-fedora25 b/opal-ci/Dockerfile-fedora25 deleted file mode 100644 index 32dead5..0000000 --- a/opal-ci/Dockerfile-fedora25 +++ /dev/null @@ -1,7 +0,0 @@ -FROM fedora:25 -RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel -RUN dnf -y install gcc-powerpc64-linux-gnu -RUN 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 -COPY . /build/ -WORKDIR /build -ENTRYPOINT ./opal-ci/build-fedora24.sh diff --git a/opal-ci/Dockerfile-fedora26 b/opal-ci/Dockerfile-fedora26 deleted file mode 100644 index 3cb66f3..0000000 --- a/opal-ci/Dockerfile-fedora26 +++ /dev/null @@ -1,7 +0,0 @@ -FROM fedora:26 -RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel -RUN dnf -y install gcc-powerpc64-linux-gnu -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 -COPY . /build/ -WORKDIR /build -ENTRYPOINT ./opal-ci/build-fedora24.sh diff --git a/opal-ci/Dockerfile-fedora27 b/opal-ci/Dockerfile-fedora27 index 770220b..969c6d4 100644 --- a/opal-ci/Dockerfile-fedora27 +++ b/opal-ci/Dockerfile-fedora27 @@ -4,4 +4,4 @@ RUN dnf -y install gcc-powerpc64-linux-gnu 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 COPY . /build/ WORKDIR /build -ENTRYPOINT ./opal-ci/build-fedora24.sh +ENTRYPOINT ./opal-ci/build-fedora27.sh diff --git a/opal-ci/build-fedora24.sh b/opal-ci/build-fedora24.sh deleted file mode 100755 index be08259..0000000 --- a/opal-ci/build-fedora24.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -set -uo pipefail -set -e -set -vx - -MAKE_J=`grep -c processor /proc/cpuinfo` -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 -# Disable GCOV builds on Fedora 24 as toolchain gives us: -# /usr/bin/powerpc64-linux-gnu-ld: section .bss VMA [0000000000200000,000000000024d757] overlaps section .sym_map VMA [000000000019f340,0000000000208e5c] -# (we shoud fix it, but not yet) -#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-fedora27.sh b/opal-ci/build-fedora27.sh new file mode 100755 index 0000000..be08259 --- /dev/null +++ b/opal-ci/build-fedora27.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +set -uo pipefail +set -e +set -vx + +MAKE_J=`grep -c processor /proc/cpuinfo` +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 +# Disable GCOV builds on Fedora 24 as toolchain gives us: +# /usr/bin/powerpc64-linux-gnu-ld: section .bss VMA [0000000000200000,000000000024d757] overlaps section .sym_map VMA [000000000019f340,0000000000208e5c] +# (we shoud fix it, but not yet) +#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