aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.vnet.ibm.com>2016-12-22 15:51:23 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2016-12-22 17:06:38 +1100
commitac751865982d0cfd17fb8dd3a764ac4ef84196a9 (patch)
treea28069b4717f719e43bf4b2873d9cfa4c2690b91
parenteb2f71e287eca6f4af1c96e024da5d9d62cc1090 (diff)
downloadskiboot-ac751865982d0cfd17fb8dd3a764ac4ef84196a9.zip
skiboot-ac751865982d0cfd17fb8dd3a764ac4ef84196a9.tar.gz
skiboot-ac751865982d0cfd17fb8dd3a764ac4ef84196a9.tar.bz2
travis: install expect on ubuntu 12.04, disable qemu on 16.04/latest
due to an oddity with our qemu (that I haven't yet debugged), the hello world test fails in qemu on recent ubuntu. Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--opal-ci/Dockerfile-ubuntu-12.042
-rw-r--r--opal-ci/Dockerfile-ubuntu-16.042
-rw-r--r--opal-ci/Dockerfile-ubuntu-latest2
-rwxr-xr-xopal-ci/build-ubuntu-16.04.sh2
4 files changed, 4 insertions, 4 deletions
diff --git a/opal-ci/Dockerfile-ubuntu-12.04 b/opal-ci/Dockerfile-ubuntu-12.04
index 6bb6ded..ee64e92 100644
--- a/opal-ci/Dockerfile-ubuntu-12.04
+++ b/opal-ci/Dockerfile-ubuntu-12.04
@@ -3,7 +3,7 @@ RUN sudo apt-get update -qq
RUN sudo apt-get install -y software-properties-common
RUN sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
RUN sudo apt-get update -qq
-RUN sudo apt-get install -y gcc-4.8 libstdc++6 valgrind expect xterm ccache
+RUN sudo apt-get install -y gcc-4.8 libstdc++6 valgrind expect xterm ccache expect
RUN sudo apt-get install -y gcc-arm-linux-gnueabi gcc-powerpc64le-linux-gnu gcc
RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 50
RUN sudo apt-get install -y wget curl
diff --git a/opal-ci/Dockerfile-ubuntu-16.04 b/opal-ci/Dockerfile-ubuntu-16.04
index 4f8a065..03cd5c5 100644
--- a/opal-ci/Dockerfile-ubuntu-16.04
+++ b/opal-ci/Dockerfile-ubuntu-16.04
@@ -1,6 +1,6 @@
FROM ubuntu:16.04
RUN apt-get update -qq
-RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache
+RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect
RUN apt-get install -y wget curl xterm
RUN apt-get install -y gcc-arm-linux-gnueabi
RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb
diff --git a/opal-ci/Dockerfile-ubuntu-latest b/opal-ci/Dockerfile-ubuntu-latest
index 4b7bfeb..dc9a57f 100644
--- a/opal-ci/Dockerfile-ubuntu-latest
+++ b/opal-ci/Dockerfile-ubuntu-latest
@@ -1,6 +1,6 @@
FROM ubuntu:latest
RUN apt-get update -qq
-RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache
+RUN apt-get install -y gcc-powerpc64le-linux-gnu gcc ccache expect
RUN apt-get install -y wget xterm curl
RUN apt-get install -y gcc-arm-linux-gnueabi
RUN curl -O ftp://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb
diff --git a/opal-ci/build-ubuntu-16.04.sh b/opal-ci/build-ubuntu-16.04.sh
index 731b671..c9e84df 100755
--- a/opal-ci/build-ubuntu-16.04.sh
+++ b/opal-ci/build-ubuntu-16.04.sh
@@ -8,7 +8,7 @@ MAKE_J=`grep -c processor /proc/cpuinfo`
export CROSS="ccache powerpc64le-linux-gnu-"
make -j${MAKE_J} all
-(cd opal-ci; ./build-qemu-powernv.sh)
+#(cd opal-ci; ./build-qemu-powernv.sh)
./opal-ci/fetch-debian-jessie-installer.sh
make -j${MAKE_J} check
(make clean; cd external/gard && CROSS= make -j${MAKE_J})