From 84c072aa67ae5e2c71da332fcfea3d511fa50a9c Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: May 05 2017 00:58:36 +0000 Subject: Make automake slightly quieter when running containertests Signed-off-by: Patrick Uiterwijk --- diff --git a/Makefile b/Makefile index 3593447..6761679 100644 --- a/Makefile +++ b/Makefile @@ -156,42 +156,42 @@ quickrun: container-quickrun # Testing within containers container-centos7: - echo "Building CentOS 7 container ..." - (cat tests/containers/Dockerfile-base tests/containers/Dockerfile-centos tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/centos:7/' | docker build -f - -q -t ipsilon-centos7 - - echo "CentOS 7 container built" + @echo "Building CentOS 7 container ..." + @(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-centos tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/centos:7/' | docker build -f - -q -t ipsilon-centos7 - + @echo "CentOS 7 container built" container-fedora24: - echo "Building Fedora 24 container ..." - (cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/fedora:24/' | docker build -f - -q -t ipsilon-fedora24 - - echo "Fedora 24 container built" + @echo "Building Fedora 24 container ..." + @(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/fedora:24/' | docker build -f - -q -t ipsilon-fedora24 - + @echo "Fedora 24 container built" container-fedora25: - echo "Building Fedora 25 container ..." - (cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/fedora:25/' | docker build -f - -q -t ipsilon-fedora25 - - echo "Fedora 25 container built" + @echo "Building Fedora 25 container ..." + @(cat tests/containers/Dockerfile-base tests/containers/Dockerfile-fedora tests/containers/Dockerfile-rpm; echo "USER testuser") | sed -e 's/BASE/fedora:25/' | docker build -f - -q -t ipsilon-fedora25 - + @echo "Fedora 25 container built" -containers: container-fedora24 container-fedora25 - echo "Containers built" +containers: container-centos7 container-fedora24 container-fedora25 + @echo "Containers built" containertest-centos7: container-centos7 - echo "Starting CentOS 7 tests ..." - docker run -v `pwd`:/code -t --rm -a stderr ipsilon-centos7 - echo "CentOS 7 passed" + @echo "Starting CentOS 7 tests ..." + @docker run -v `pwd`:/code -t --rm -a stderr ipsilon-centos7 + @echo "CentOS 7 passed" containertest-fedora24: container-fedora24 - echo "Starting Fedora 24 tests ..." - docker run -v `pwd`:/code -t --rm -a stderr ipsilon-fedora24 - echo "Fedora 24 passed" + @echo "Starting Fedora 24 tests ..." + @docker run -v `pwd`:/code -t --rm -a stderr ipsilon-fedora24 + @echo "Fedora 24 passed" containertest-fedora25: container-fedora25 - echo "Starting Fedora 25 tests ..." - docker run -v `pwd`:/code -t --rm -a stderr ipsilon-fedora25 - echo "Fedora 25 passed" + @echo "Starting Fedora 25 tests ..." + @docker run -v `pwd`:/code -t --rm -a stderr ipsilon-fedora25 + @echo "Fedora 25 passed" containertest-lint: container-fedora25 - echo "Starting code lint tests ..." - docker run -v `pwd`:/code -t --rm -a stderr --entrypoint /usr/bin/make ipsilon-fedora25 lint pep8 - echo "Code lint tests passed" + @echo "Starting code lint tests ..." + @docker run -v `pwd`:/code -t --rm -a stderr --entrypoint /usr/bin/make ipsilon-fedora25 lint pep8 + @echo "Code lint tests passed" containertest: containertest-lint containertest-centos7 containertest-fedora24 containertest-fedora25 - echo "Container tests passed" + @echo "Container tests passed"