From ce8417b8c4e039b1d95ece0856f5f2a99d9c6132 Mon Sep 17 00:00:00 2001
From: Stewart Smith <stewart@linux.ibm.com>
Date: Thu, 29 Nov 2018 16:54:06 +1100
Subject: opal-ci: Drop fedora27, add fedora29

Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
---
 .travis.yml                 |  2 +-
 opal-ci/Dockerfile-fedora27 |  6 ------
 opal-ci/Dockerfile-fedora29 |  9 +++++++++
 opal-ci/build-fedora27.sh   | 25 -------------------------
 opal-ci/build-fedora29.sh   |  1 +
 5 files changed, 11 insertions(+), 32 deletions(-)
 delete mode 100644 opal-ci/Dockerfile-fedora27
 create mode 100644 opal-ci/Dockerfile-fedora29
 delete mode 100755 opal-ci/build-fedora27.sh
 create mode 120000 opal-ci/build-fedora29.sh

diff --git a/.travis.yml b/.travis.yml
index a77aa14..f692892 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,8 @@ env:
     - RUN_ON_CONTAINER=ubuntu-latest
     - RUN_ON_CONTAINER=centos6
     - RUN_ON_CONTAINER=centos7
-    - RUN_ON_CONTAINER=fedora27
     - RUN_ON_CONTAINER=fedora28
+    - RUN_ON_CONTAINER=fedora29
     - RUN_ON_CONTAINER=fedora-rawhide
     - RUN_ON_CONTAINER=debian-stretch
     - RUN_ON_CONTAINER=debian-unstable
diff --git a/opal-ci/Dockerfile-fedora27 b/opal-ci/Dockerfile-fedora27
deleted file mode 100644
index 06c206c..0000000
--- a/opal-ci/Dockerfile-fedora27
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM fedora:27
-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
diff --git a/opal-ci/Dockerfile-fedora29 b/opal-ci/Dockerfile-fedora29
new file mode 100644
index 0000000..07795bb
--- /dev/null
+++ b/opal-ci/Dockerfile-fedora29
@@ -0,0 +1,9 @@
+FROM fedora:29
+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 
+# 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-fedora27.sh b/opal-ci/build-fedora27.sh
deleted file mode 100755
index 02ac428..0000000
--- a/opal-ci/build-fedora27.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-fedora29.sh b/opal-ci/build-fedora29.sh
new file mode 120000
index 0000000..74d8636
--- /dev/null
+++ b/opal-ci/build-fedora29.sh
@@ -0,0 +1 @@
+build-fedora28.sh
\ No newline at end of file
-- 
cgit v1.1