travis: Use docker scripts
diff mbox series

Message ID 20180815032629.3447-1-sam@mendozajonas.com
State Accepted
Headers show
Series
  • travis: Use docker scripts
Related show

Commit Message

Samuel Mendoza-Jonas Aug. 15, 2018, 3:26 a.m. UTC
Update the Travis config to use Petitboot's own docker scripts, and add
ppc64le to the list of recognised architectures.

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
---
 .travis.yml            | 11 +++--------
 docker/builder-include |  1 +
 2 files changed, 4 insertions(+), 8 deletions(-)

Comments

Geoff Levand Aug. 15, 2018, 4:34 p.m. UTC | #1
Hi Sam,

On 08/14/2018 08:26 PM, Samuel Mendoza-Jonas wrote:
> Update the Travis config to use Petitboot's own docker scripts, and add
> ppc64le to the list of recognised architectures.

recognized?

> + - ./docker/build-pb --check --verbose --configure-opts "--enable-platform-arm64 --enable-platform-powerpc"

The /sbin/dmidecode in configure.ac is OK for buildroot, but for the ubuntu
based docker image we'll need:
  
  --configure-opts "HOST_PROG_DMIDECODE=/usr/sbin/dmidecode --enable-platform-arm64 --enable-platform-powerpc"

-Geoff
Geoff Levand Aug. 15, 2018, 5:50 p.m. UTC | #2
Hi Sam,

On 08/15/2018 09:34 AM, Geoff Levand wrote:
>> + - ./docker/build-pb --check --verbose --configure-opts "--enable-platform-arm64 --enable-platform-powerpc"
> 
> The /sbin/dmidecode in configure.ac is OK for buildroot, but for the ubuntu
> based docker image we'll need:
>   
>   --configure-opts "HOST_PROG_DMIDECODE=/usr/sbin/dmidecode --enable-platform-arm64 --enable-platform-powerpc"

Sorry, I sent this out in a hurry (had a meeting to get to)
and should have been more clear.  If we want to run the
discover binary in the pb-builder container to test it
we'll need to set HOST_PROG_DMIDECODE, for arm64 at least.

As of now, we don't need this though.

-Geoff
Samuel Mendoza-Jonas Aug. 16, 2018, 1:09 a.m. UTC | #3
On Wed, 2018-08-15 at 10:50 -0700, Geoff Levand wrote:
> Hi Sam,
> 
> On 08/15/2018 09:34 AM, Geoff Levand wrote:
> > > + - ./docker/build-pb --check --verbose --configure-opts "--enable-platform-arm64 --enable-platform-powerpc"
> > 
> > The /sbin/dmidecode in configure.ac is OK for buildroot, but for the ubuntu
> > based docker image we'll need:
> >   
> >   --configure-opts "HOST_PROG_DMIDECODE=/usr/sbin/dmidecode --enable-platform-arm64 --enable-platform-powerpc"
> 
> Sorry, I sent this out in a hurry (had a meeting to get to)
> and should have been more clear.  If we want to run the
> discover binary in the pb-builder container to test it
> we'll need to set HOST_PROG_DMIDECODE, for arm64 at least.
> 
> As of now, we don't need this though.
> 
> -Geoff

Hi Geoff,

Thanks for pointing that out, I'll leave it out for the moment but I'll
keep it in the back of my head if we start to do more stuff in Travis.

Cheers,
Sam

Patch
diff mbox series

diff --git a/.travis.yml b/.travis.yml
index 1b82a1ad..f458213a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,18 +2,13 @@  language: c
 
 sudo: required
 dist: trusty
+services: docker
 os:
  - linux
  - linux-ppc64le
 
 before_install:
- - sudo apt-get -qq update
- - sudo apt-get install -y autopoint libuv-dev libdevmapper-dev flex bison
- - ./bootstrap
-
-install:
- - ./configure --with-twin-x11=no --with-twin-fbdev=no
- - make
+ - ./docker/build-builder
 
 script:
- - make check
+ - ./docker/build-pb --check --verbose --configure-opts "--enable-platform-arm64 --enable-platform-powerpc"
diff --git a/docker/builder-include b/docker/builder-include
index 4f42e2c6..585be265 100644
--- a/docker/builder-include
+++ b/docker/builder-include
@@ -25,6 +25,7 @@  docker_from() {
 	case "${a}" in
 		amd64) echo "ubuntu:17.10" ;;
 		arm64) echo "arm64v8/ubuntu:17.10" ;;
+		ppc64le) echo "ppc64le/ubuntu:17.10" ;;
 		*)
 			echo "${name}: ERROR: Unknown arch ${a}" >&2
 			exit 1