Pārlūkot izejas kodu

On a test failure only show the last 100 lines of daemon output.

Signed-off-by: Daniel Nephin <[email protected]>
Daniel Nephin 10 gadi atpakaļ
vecāks
revīzija
abde64d610
2 mainītis faili ar 3 papildinājumiem un 2 dzēšanām
  1. 1 1
      script/build-linux-inner
  2. 2 1
      script/test-versions

+ 1 - 1
script/build-linux-inner

@@ -8,7 +8,7 @@ VENV=/code/.tox/py27
 mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
 
-$VENV/bin/pip install -r requirements-build.txt
+$VENV/bin/pip install -q -r requirements-build.txt
 su -c "$VENV/bin/pyinstaller docker-compose.spec" user
 mv dist/docker-compose $TARGET
 $TARGET version

+ 2 - 1
script/test-versions

@@ -31,7 +31,7 @@ for version in $DOCKER_VERSIONS; do
 
   function on_exit() {
     if [[ "$?" != "0" ]]; then
-        docker logs "$daemon_container"
+        docker logs "$daemon_container" 2>&1 | tail -n 100
     fi
     docker rm -vf "$daemon_container"
   }
@@ -45,6 +45,7 @@ for version in $DOCKER_VERSIONS; do
     --volume="/var/lib/docker" \
     dockerswarm/dind:$version \
     docker daemon -H tcp://0.0.0.0:2375 $DOCKER_DAEMON_ARGS \
+    2>&1 | tail -n 10
 
   docker run \
     --rm \