diff options
| author | Stewart Smith <stewart@linux.ibm.com> | 2018-05-04 16:34:15 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2018-05-06 10:27:37 -0500 |
| commit | 7dab94cf5727e71296ccce8f3e18f08e95dc9de4 (patch) | |
| tree | 0c15b8ebcc7a6cf87b322a6935f0525f9636ee99 /opal-ci/Dockerfile-ubuntu-latest | |
| parent | f8ee10ee9505ab44e823586bf5c4ae5b1044df87 (diff) | |
| download | talos-skiboot-7dab94cf5727e71296ccce8f3e18f08e95dc9de4.tar.gz talos-skiboot-7dab94cf5727e71296ccce8f3e18f08e95dc9de4.zip | |
travis: fix if x86_64 tests in dockerfiles.
In today's lesson, Stewart learns shell.
Fixes: e101e85c9ff65e82f7ede4d5541d921b4a3ed923
Reported-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'opal-ci/Dockerfile-ubuntu-latest')
| -rw-r--r-- | opal-ci/Dockerfile-ubuntu-latest | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opal-ci/Dockerfile-ubuntu-latest b/opal-ci/Dockerfile-ubuntu-latest index dfb62b7c..6adb170a 100644 --- a/opal-ci/Dockerfile-ubuntu-latest +++ b/opal-ci/Dockerfile-ubuntu-latest @@ -4,8 +4,8 @@ RUN apt-get update -qq RUN if [ `arch` != "ppc64le" ]; then apt-get update -qq && apt-get install -y gcc-powerpc64le-linux-gnu; fi RUN apt-get update -qq && apt-get install -y gcc ccache expect libssl-dev wget curl xterm device-tree-compiler build-essential gcc python g++ pkg-config libz-dev libglib2.0-dev libpixman-1-dev libfdt-dev git libstdc++6 valgrind libtcl8.6 RUN apt-get update -qq && apt-get install -y gcc-arm-linux-gnueabi || true -RUN if [ `arch` == "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi -RUN if [ `arch` == "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi +RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/packages/v1.0-2/systemsim-p8_1.0-2_amd64.deb; dpkg -i systemsim-p8_1.0-2_amd64.deb; fi +RUN if [ `arch` = "x86_64" ]; then curl -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.1-0/systemsim-p9-1.1-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.1-0-trusty_amd64.deb; fi COPY . /build/ WORKDIR /build ENTRYPOINT ./opal-ci/build-ubuntu-16.04.sh |
