diff --git a/.travis.yml b/.travis.yml index c317e959725..b344953a872 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,7 @@ install: script: - KUBE_RACE="-race" KUBE_COVER="y" KUBE_GOVERALLS_BIN="$HOME/gopath/bin/goveralls" KUBE_TIMEOUT='-timeout 300s' KUBE_COVERPROCS=8 KUBE_TEST_API_VERSIONS=$KUBE_TEST_API_VERSIONS ./hack/test-go.sh -- -p=2 - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/test-cmd.sh - - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH KUBE_TEST_API_VERSIONS=$KUBE_TEST_API_VERSIONS KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 ./hack/test-integration.sh + - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH KUBE_TEST_API_VERSIONS=$KUBE_TEST_API_VERSIONS KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 LOG_LEVEL=4 ./hack/test-integration.sh notifications: irc: "chat.freenode.net#google-containers" diff --git a/hack/test-integration.sh b/hack/test-integration.sh index 976d4927a54..01d253874d0 100755 --- a/hack/test-integration.sh +++ b/hack/test-integration.sh @@ -27,6 +27,7 @@ source "${KUBE_ROOT}/hack/lib/init.sh" # Comma separated list of API Versions that should be tested. KUBE_TEST_API_VERSIONS=${KUBE_TEST_API_VERSIONS:-"v1beta1,v1beta3"} KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY:-"-1"} +LOG_LEVEL=${LOG_LEVEL:-2} cleanup() { kube::etcd::cleanup @@ -44,7 +45,7 @@ runTests() { kube::log::status "Running integration test scenario" - "${KUBE_OUTPUT_HOSTBIN}/integration" --v=2 --apiVersion="$1" \ + "${KUBE_OUTPUT_HOSTBIN}/integration" --v=${LOG_LEVEL} --apiVersion="$1" \ --maxConcurrency="${KUBE_INTEGRATION_TEST_MAX_CONCURRENCY}" cleanup diff --git a/shippable.yml b/shippable.yml index 555d49baac5..fe9da1c7cfc 100644 --- a/shippable.yml +++ b/shippable.yml @@ -33,7 +33,7 @@ install: script: - KUBE_RACE="-race" KUBE_COVER="y" KUBE_GOVERALLS_BIN="$HOME/gopath/bin/goveralls" KUBE_TIMEOUT='-timeout 300s' KUBE_COVERPROCS=8 KUBE_TEST_API_VERSIONS=$KUBE_TEST_API_VERSIONS ./hack/test-go.sh -- -p=2 - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH ./hack/test-cmd.sh - - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH KUBE_TEST_API_VERSIONS=$KUBE_TEST_API_VERSIONS KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 ./hack/test-integration.sh + - PATH=$HOME/gopath/bin:./third_party/etcd:$PATH KUBE_TEST_API_VERSIONS=$KUBE_TEST_API_VERSIONS KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 LOG_LEVEL=4 ./hack/test-integration.sh notifications: irc: "chat.freenode.net#google-containers"