aboutsummaryrefslogtreecommitdiff
path: root/opal-ci
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.ibm.com>2018-10-29 10:56:21 +1100
committerStewart Smith <stewart@linux.ibm.com>2018-10-29 11:41:29 +1100
commitd513609b4f48d188dcd2e9ba8af831a92464d15c (patch)
treee0f58cdd433a723dedf3354ae1beb28bd4cffe3c /opal-ci
parentb6de35b6896a7d21a72be79e720eeae2dc620fa2 (diff)
downloadskiboot-d513609b4f48d188dcd2e9ba8af831a92464d15c.zip
skiboot-d513609b4f48d188dcd2e9ba8af831a92464d15c.tar.gz
skiboot-d513609b4f48d188dcd2e9ba8af831a92464d15c.tar.bz2
travis/ci: rework Dockerfiles to produce build artifacts
ubuntu-latest was also missing clang, as ubuntu-latest is closer to ubuntu 18.04 than 16.04 Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'opal-ci')
-rw-r--r--opal-ci/Dockerfile-centos61
-rw-r--r--opal-ci/Dockerfile-centos71
-rw-r--r--opal-ci/Dockerfile-debian-stretch1
-rw-r--r--opal-ci/Dockerfile-debian-unstable1
-rw-r--r--opal-ci/Dockerfile-docs1
-rw-r--r--opal-ci/Dockerfile-fedora-rawhide1
-rw-r--r--opal-ci/Dockerfile-fedora271
-rw-r--r--opal-ci/Dockerfile-fedora282
-rw-r--r--opal-ci/Dockerfile-ubuntu-16.042
-rw-r--r--opal-ci/Dockerfile-ubuntu-18.041
-rw-r--r--opal-ci/Dockerfile-ubuntu-latest5
l---------opal-ci/build-debian-stretch.sh1
l---------opal-ci/build-debian-unstable.sh1
-rw-r--r--opal-ci/build-docs.sh8
l---------opal-ci/build-fedora-rawhide.sh1
l---------opal-ci/build-ubuntu-latest.sh1
16 files changed, 16 insertions, 13 deletions
diff --git a/opal-ci/Dockerfile-centos6 b/opal-ci/Dockerfile-centos6
index de6f2bc..263a98e 100644
--- a/opal-ci/Dockerfile-centos6
+++ b/opal-ci/Dockerfile-centos6
@@ -8,4 +8,3 @@ RUN curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p8/package
RUN yum -y install systemsim-p8-1.0-2.el6.x86_64.rpm
COPY . /build/
WORKDIR /build
-ENTRYPOINT ./opal-ci/build-centos6.sh
diff --git a/opal-ci/Dockerfile-centos7 b/opal-ci/Dockerfile-centos7
index 3b041af..ab94ef6 100644
--- a/opal-ci/Dockerfile-centos7
+++ b/opal-ci/Dockerfile-centos7
@@ -11,4 +11,3 @@ RUN curl -L https://github.com/dgibson/dtc/archive/v1.4.2.tar.gz|tar xfz -
RUN (cd dtc-1.4.2; make PREFIX=/usr/local install)
COPY . /build/
WORKDIR /build
-ENTRYPOINT ./opal-ci/build-centos7.sh
diff --git a/opal-ci/Dockerfile-debian-stretch b/opal-ci/Dockerfile-debian-stretch
index 9485e7a..f9e4ae2 100644
--- a/opal-ci/Dockerfile-debian-stretch
+++ b/opal-ci/Dockerfile-debian-stretch
@@ -7,4 +7,3 @@ 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/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb; fi
COPY . /build/
WORKDIR /build
-ENTRYPOINT ./opal-ci/build-ubuntu-16.04.sh
diff --git a/opal-ci/Dockerfile-debian-unstable b/opal-ci/Dockerfile-debian-unstable
index 8a21008..d988800 100644
--- a/opal-ci/Dockerfile-debian-unstable
+++ b/opal-ci/Dockerfile-debian-unstable
@@ -8,4 +8,3 @@ RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software
RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software/server/powerfuncsim/p9/packages/v1.0-0/systemsim-p9-1.0-0-trusty_amd64.deb; dpkg -i systemsim-p9-1.0-0-trusty_amd64.deb; fi
COPY . /build/
WORKDIR /build
-ENTRYPOINT ./opal-ci/build-ubuntu-16.04.sh
diff --git a/opal-ci/Dockerfile-docs b/opal-ci/Dockerfile-docs
index 0ebd391..4e5f2d8 100644
--- a/opal-ci/Dockerfile-docs
+++ b/opal-ci/Dockerfile-docs
@@ -2,4 +2,3 @@ FROM fedora:27
RUN dnf -y install wget curl xterm gcc git xz make diffutils findutils expect valgrind valgrind-devel ccache dtc openssl-devel
COPY . /build/
WORKDIR /build
-ENTRYPOINT ./opal-ci/build-docs.sh
diff --git a/opal-ci/Dockerfile-fedora-rawhide b/opal-ci/Dockerfile-fedora-rawhide
index 4031100..a6056a4 100644
--- a/opal-ci/Dockerfile-fedora-rawhide
+++ b/opal-ci/Dockerfile-fedora-rawhide
@@ -4,4 +4,3 @@ 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
-ENTRYPOINT ./opal-ci/build-fedora27.sh
diff --git a/opal-ci/Dockerfile-fedora27 b/opal-ci/Dockerfile-fedora27
index 4d9537b..06c206c 100644
--- a/opal-ci/Dockerfile-fedora27
+++ b/opal-ci/Dockerfile-fedora27
@@ -4,4 +4,3 @@ 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
-ENTRYPOINT ./opal-ci/build-fedora27.sh
diff --git a/opal-ci/Dockerfile-fedora28 b/opal-ci/Dockerfile-fedora28
index 14c40ff..c863d93 100644
--- a/opal-ci/Dockerfile-fedora28
+++ b/opal-ci/Dockerfile-fedora28
@@ -6,4 +6,4 @@ 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
-ENTRYPOINT ./opal-ci/build-fedora28.sh
+
diff --git a/opal-ci/Dockerfile-ubuntu-16.04 b/opal-ci/Dockerfile-ubuntu-16.04
index ce3148c..c53bf03 100644
--- a/opal-ci/Dockerfile-ubuntu-16.04
+++ b/opal-ci/Dockerfile-ubuntu-16.04
@@ -8,4 +8,4 @@ RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software
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
+
diff --git a/opal-ci/Dockerfile-ubuntu-18.04 b/opal-ci/Dockerfile-ubuntu-18.04
index 6e86094..1743df2 100644
--- a/opal-ci/Dockerfile-ubuntu-18.04
+++ b/opal-ci/Dockerfile-ubuntu-18.04
@@ -7,4 +7,3 @@ RUN if [ `arch` = "x86_64" ]; then curl -L -O http://public.dhe.ibm.com/software
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-18.04.sh
diff --git a/opal-ci/Dockerfile-ubuntu-latest b/opal-ci/Dockerfile-ubuntu-latest
index 6adb170..c729214 100644
--- a/opal-ci/Dockerfile-ubuntu-latest
+++ b/opal-ci/Dockerfile-ubuntu-latest
@@ -2,10 +2,9 @@ FROM ubuntu:latest
ENV DEBIAN_FRONTEND noninteractive
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 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 clang qemu-system-ppc
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
COPY . /build/
-WORKDIR /build
-ENTRYPOINT ./opal-ci/build-ubuntu-16.04.sh
+WORKDIR /build \ No newline at end of file
diff --git a/opal-ci/build-debian-stretch.sh b/opal-ci/build-debian-stretch.sh
new file mode 120000
index 0000000..a340f14
--- /dev/null
+++ b/opal-ci/build-debian-stretch.sh
@@ -0,0 +1 @@
+build-ubuntu-16.04.sh \ No newline at end of file
diff --git a/opal-ci/build-debian-unstable.sh b/opal-ci/build-debian-unstable.sh
new file mode 120000
index 0000000..a340f14
--- /dev/null
+++ b/opal-ci/build-debian-unstable.sh
@@ -0,0 +1 @@
+build-ubuntu-16.04.sh \ No newline at end of file
diff --git a/opal-ci/build-docs.sh b/opal-ci/build-docs.sh
new file mode 100644
index 0000000..817773b
--- /dev/null
+++ b/opal-ci/build-docs.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+set -uo pipefail
+set -e
+set -vx
+
+cd doc;
+make html latexpdf text
diff --git a/opal-ci/build-fedora-rawhide.sh b/opal-ci/build-fedora-rawhide.sh
new file mode 120000
index 0000000..74d8636
--- /dev/null
+++ b/opal-ci/build-fedora-rawhide.sh
@@ -0,0 +1 @@
+build-fedora28.sh \ No newline at end of file
diff --git a/opal-ci/build-ubuntu-latest.sh b/opal-ci/build-ubuntu-latest.sh
new file mode 120000
index 0000000..d8840a9
--- /dev/null
+++ b/opal-ci/build-ubuntu-latest.sh
@@ -0,0 +1 @@
+build-ubuntu-18.04.sh \ No newline at end of file