From 5193e56a653fa95d1b91b08ad08201aaebe34923 Mon Sep 17 00:00:00 2001 From: Jean-Christophe Berthon Date: Wed, 8 Feb 2017 12:33:57 +0000 Subject: [PATCH] Add first attempt at supporting test suite on ARM Modify `script/test/default` so it supports a first attempt at testing on ARM. Call the script with: `$ DOCKERFILE=Dockerfile.armhf script/test/default` to use the Dockerfile.armhf instead of the default Dockerfile for building the image. However, running the script is not working fully. The problem is that `dockerswarm/dind` does not provide an ARM image and therefore cannot be executed. If that is fixed then we should be able to change the script in order to use the ARM image instead of the default x86_64 image for running further tests. Signed-off-by: Jean-Christophe Berthon --- script/test/default | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/script/test/default b/script/test/default index fa741a19d..aabb4e426 100755 --- a/script/test/default +++ b/script/test/default @@ -5,11 +5,15 @@ set -ex TAG="docker-compose:$(git rev-parse --short HEAD)" +# By default use the Dockerfile, but can be overriden to use an alternative file +# e.g DOCKERFILE=Dockerfile.armhf script/test/default +DOCKERFILE="${DOCKERFILE:-Dockerfile}" + rm -rf coverage-html # Create the host directory so it's owned by $USER mkdir -p coverage-html -docker build -t "$TAG" . +docker build -f ${DOCKERFILE} -t "$TAG" . GIT_VOLUME="--volume=$(pwd)/.git:/code/.git" . script/test/all