From 468a2dc1da2cbfc125ab9563d4ee4ccbf696d7a4 Mon Sep 17 00:00:00 2001
From: Stewart Smith <stewart@linux.ibm.com>
Date: Mon, 22 Jul 2019 15:30:34 +1000
Subject: [PATCH] travis: remove fedora29

No need to keep old Fedora releases around.

Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
---
 .travis.yml                     |  1 -
 opal-ci/Dockerfile-fedora29     |  9 ---------
 opal-ci/build-fedora-rawhide.sh |  2 +-
 opal-ci/build-fedora29.sh       | 30 ------------------------------
 opal-ci/build-fedora30.sh       | 31 ++++++++++++++++++++++++++++++-
 5 files changed, 31 insertions(+), 42 deletions(-)
 delete mode 100644 opal-ci/Dockerfile-fedora29
 delete mode 100755 opal-ci/build-fedora29.sh
 mode change 120000 => 100755 opal-ci/build-fedora30.sh

diff --git a/.travis.yml b/.travis.yml
index 768c28000490..6ddf485d7c83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,6 @@ env:
     - RUN_ON_CONTAINER=ubuntu-18.04
     - RUN_ON_CONTAINER=ubuntu-latest
     - RUN_ON_CONTAINER=centos7
-    - RUN_ON_CONTAINER=fedora29
     - RUN_ON_CONTAINER=fedora30
     - RUN_ON_CONTAINER=fedora-rawhide
     - RUN_ON_CONTAINER=debian-stretch
diff --git a/opal-ci/Dockerfile-fedora29 b/opal-ci/Dockerfile-fedora29
deleted file mode 100644
index 1fdadd48c336..000000000000
--- a/opal-ci/Dockerfile-fedora29
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM fedora:29
-RUN dnf -y install --allowerasing 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 
-# below packages are for building dtc
-RUN dnf -y install flex bison
-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
-
diff --git a/opal-ci/build-fedora-rawhide.sh b/opal-ci/build-fedora-rawhide.sh
index fe333f08976e..6ea4b3ffadf4 120000
--- a/opal-ci/build-fedora-rawhide.sh
+++ b/opal-ci/build-fedora-rawhide.sh
@@ -1 +1 @@
-build-fedora29.sh
\ No newline at end of file
+build-fedora30.sh
\ No newline at end of file
diff --git a/opal-ci/build-fedora29.sh b/opal-ci/build-fedora29.sh
deleted file mode 100755
index 56099d288c02..000000000000
--- a/opal-ci/build-fedora29.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-set -uo pipefail
-set -e
-set -vx
-
-MAKE_J=$(grep -c processor /proc/cpuinfo)
-export CROSS="ccache powerpc64-linux-gnu-"
-
-# There's a bug in dtc v1.4.7 packaged on fedora 28 that makes our device tree
-# tests fail, so for the moment, build a slightly older DTC
-git clone --depth=1 -b v1.4.4 https://git.kernel.org/pub/scm/utils/dtc/dtc.git
-(cd dtc; make -j${MAKE_J})
-export PATH=`pwd`/dtc:$PATH
-
-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})
-# GCOV build disabled for GCC 8.2
-# https://github.com/open-power/skiboot/issues/206
-#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-fedora30.sh b/opal-ci/build-fedora30.sh
deleted file mode 120000
index fe333f08976e..000000000000
--- a/opal-ci/build-fedora30.sh
+++ /dev/null
@@ -1 +0,0 @@
-build-fedora29.sh
\ No newline at end of file
diff --git a/opal-ci/build-fedora30.sh b/opal-ci/build-fedora30.sh
new file mode 100755
index 000000000000..56099d288c02
--- /dev/null
+++ b/opal-ci/build-fedora30.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -uo pipefail
+set -e
+set -vx
+
+MAKE_J=$(grep -c processor /proc/cpuinfo)
+export CROSS="ccache powerpc64-linux-gnu-"
+
+# There's a bug in dtc v1.4.7 packaged on fedora 28 that makes our device tree
+# tests fail, so for the moment, build a slightly older DTC
+git clone --depth=1 -b v1.4.4 https://git.kernel.org/pub/scm/utils/dtc/dtc.git
+(cd dtc; make -j${MAKE_J})
+export PATH=`pwd`/dtc:$PATH
+
+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})
+# GCOV build disabled for GCC 8.2
+# https://github.com/open-power/skiboot/issues/206
+#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