docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use per-check timeouts 

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2016-03-11 14:06:56 -05:00
parent e6e0837cbb
commit 11d3f7092e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/Jenkins/W2L/setup.sh
View File

@ -196,7 +196,7 @@ fi
if [ $ec -eq 0 ]; then if [ $ec -eq 0 ]; then
echo "INFO: Starting local build of Windows binary..." echo "INFO: Starting local build of Windows binary..."
set -x set -x
export TIMEOUT="120m" export TIMEOUT="5m"
export DOCKER_HOST="tcp://$ip:$port_inner" export DOCKER_HOST="tcp://$ip:$port_inner"
export DOCKER_TEST_HOST="tcp://$ip:$port_inner" export DOCKER_TEST_HOST="tcp://$ip:$port_inner"
unset DOCKER_CLIENTONLY unset DOCKER_CLIENTONLY

9
hack/make.sh
View File

@ -169,15 +169,13 @@ BUILDFLAGS=( $BUILDFLAGS "${ORIG_BUILDFLAGS[@]}" )
# Test timeout. # Test timeout.
if [ "${DOCKER_ENGINE_GOARCH}" == "arm" ]; then if [ "${DOCKER_ENGINE_GOARCH}" == "arm" ]; then
: ${TIMEOUT:=210m} : ${TIMEOUT:=10m}
elif [ "${DOCKER_ENGINE_GOARCH}" == "windows" ]; then elif [ "${DOCKER_ENGINE_GOARCH}" == "windows" ]; then
: ${TIMEOUT:=180m} : ${TIMEOUT:=8m}
else else
: ${TIMEOUT:=120m} : ${TIMEOUT:=5m}
fi fi
TESTFLAGS+=" -test.timeout=${TIMEOUT}"
LDFLAGS_STATIC_DOCKER=" LDFLAGS_STATIC_DOCKER="
$LDFLAGS_STATIC $LDFLAGS_STATIC
-extldflags \"$EXTLDFLAGS_STATIC\" -extldflags \"$EXTLDFLAGS_STATIC\"
@ -250,6 +248,7 @@ test_env() {
DOCKER_REMAP_ROOT="$DOCKER_REMAP_ROOT" \ DOCKER_REMAP_ROOT="$DOCKER_REMAP_ROOT" \
DOCKER_REMOTE_DAEMON="$DOCKER_REMOTE_DAEMON" \ DOCKER_REMOTE_DAEMON="$DOCKER_REMOTE_DAEMON" \
GOPATH="$GOPATH" \ GOPATH="$GOPATH" \
GOTRACEBACK=all \
HOME="$ABS_DEST/fake-HOME" \ HOME="$ABS_DEST/fake-HOME" \
PATH="$PATH" \ PATH="$PATH" \
TEMP="$TEMP" \ TEMP="$TEMP" \

2
hack/make/test-integration-cli
View File

@ -2,7 +2,7 @@
set -e set -e
bundle_test_integration_cli() { bundle_test_integration_cli() {
TESTFLAGS="$TESTFLAGS -check.v" TESTFLAGS="$TESTFLAGS -check.v -check.timeout=${TIMEOUT} -timeout=360m"
go_test_dir ./integration-cli go_test_dir ./integration-cli
} }

1
hack/make/test-unit
View File

@ -8,6 +8,7 @@ set -e
# TESTFLAGS='-test.run ^TestBuild$' ./hack/make.sh test-unit # TESTFLAGS='-test.run ^TestBuild$' ./hack/make.sh test-unit
# #
bundle_test_unit() { bundle_test_unit() {
TESTFLAGS+=" -test.timeout=${TIMEOUT}"
date date
if [ -z "$TESTDIRS" ]; then if [ -z "$TESTDIRS" ]; then
TEST_PATH=./... TEST_PATH=./...