From 5b9096ef3f5f4c9caf56a223cfbddb7e8f445d60 Mon Sep 17 00:00:00 2001 From: peusterm Date: Thu, 7 Sep 2017 16:37:15 +0200 Subject: [PATCH] Fix: Jenkins worker don't have a TTY. Do not run the test container with "-it". Signed-off-by: Manuel Peuster --- utils/ci/jenkins_entrypoint.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/utils/ci/jenkins_entrypoint.sh b/utils/ci/jenkins_entrypoint.sh index 133f82b..6c5941e 100755 --- a/utils/ci/jenkins_entrypoint.sh +++ b/utils/ci/jenkins_entrypoint.sh @@ -29,12 +29,6 @@ # Script has to be called from "son-emu" root directory, like: sudo ./utils/ci/jenkins_entrypoint.sh export DOCKER_HOST="unix:///var/run/docker.sock" -# don't rely on Debian/Ubuntu Docker engine -#apt-get remove docker-engine -# make sure we start from scratch -#pip uninstall docker-py -#pip uninstall docker - set -e set -x @@ -46,10 +40,10 @@ set -x #apt-get install docker-ce # build the container -docker build -t son-emu-img . +docker build -t test-son-emu-img . # launch the container and trigger the unit tests -docker run --name son-emu -it --rm --privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock son-emu-img py.test -v src/emuvim/test/unittests +docker run --name son-emu --rm --privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock test-son-emu-img py.test -v src/emuvim/test/unittests # # old way to call the tests directly on the host machine -- 2.17.1