diff --git a/cluster/common.sh b/cluster/common.sh index 80aef9a6a8..5196faf59c 100755 --- a/cluster/common.sh +++ b/cluster/common.sh @@ -528,6 +528,11 @@ EOF if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then cat >>$file <>$file <>/srv/salt-overlay/pillar/cluster-params.sls kubelet_test_log_level: '$(echo "$KUBELET_TEST_LOG_LEVEL" | sed -e "s/'/''/g")' +EOF + fi + if [ -n "${DOCKER_TEST_LOG_LEVEL:-}" ]; then + cat <>/srv/salt-overlay/pillar/cluster-params.sls +docker_test_log_level: '$(echo "$DOCKER_TEST_LOG_LEVEL" | sed -e "s/'/''/g")' EOF fi if [ -n "${CONTROLLER_MANAGER_TEST_ARGS:-}" ]; then diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults index 5b97c16d6a..c68534bd62 100644 --- a/cluster/saltbase/salt/docker/docker-defaults +++ b/cluster/saltbase/salt/docker/docker-defaults @@ -7,5 +7,9 @@ {% if pillar.get('network_provider', '').lower() == 'kubenet' %} {% set bridge_opts = "" %} {% endif -%} -DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false --log-level=warn" +{% set log_level = pillar['log_level'] -%} +{% if pillar['docker_test_log_level'] is defined -%} + {% set log_level = pillar['docker_test_log_level'] -%} +{% endif -%} +DOCKER_OPTS="{{grains_opts}} {{e2e_opts}} {{bridge_opts}} --iptables=false --ip-masq=false {{log_level}}" DOCKER_NOFILE=1000000 diff --git a/hack/jenkins/job-configs/kubernetes-e2e.yaml b/hack/jenkins/job-configs/kubernetes-e2e.yaml index ba4e9b2091..e90e77bea6 100644 --- a/hack/jenkins/job-configs/kubernetes-e2e.yaml +++ b/hack/jenkins/job-configs/kubernetes-e2e.yaml @@ -146,6 +146,8 @@ export REGISTER_MASTER="true" # Reduce logs verbosity export TEST_CLUSTER_LOG_LEVEL="--v=2" + # TODO: Remove when we figure out #22166 and other docker potential slowness + export DOCKER_TEST_LOG_LEVEL="--log-level=info" # TODO: Remove when we figure out the reason for occasional failures #19048 export KUBELET_TEST_LOG_LEVEL="--v=4" # Increase resync period to simulate production