summaryrefslogtreecommitdiffstats
path: root/opal-ci/Dockerfile-ubuntu-12.04
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 /opal-ci/Dockerfile-ubuntu-12.04
parenteb2f71e287eca6f4af1c96e024da5d9d62cc1090 (diff)
downloadblackbird-skiboot-ac751865982d0cfd17fb8dd3a764ac4ef84196a9.tar.gz
blackbird-skiboot-ac751865982d0cfd17fb8dd3a764ac4ef84196a9.zip
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>
Diffstat (limited to 'opal-ci/Dockerfile-ubuntu-12.04')
-rw-r--r--opal-ci/Dockerfile-ubuntu-12.042
1 files changed, 1 insertions, 1 deletions
diff --git a/opal-ci/Dockerfile-ubuntu-12.04 b/opal-ci/Dockerfile-ubuntu-12.04
index 6bb6dedf..ee64e920 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
OpenPOWER on IntegriCloud