Merge pull request #22453 from dchen1107/test1

Enable --log-level=info for docker daemons for scalability jenkins jo…
This commit is contained in:
Jeff Lowdermilk
2016-03-03 16:29:34 -08:00
5 changed files with 18 additions and 1 deletions

View File

@@ -464,6 +464,11 @@ EOF
if [ -n "${KUBELET_TEST_LOG_LEVEL:-}" ]; then
cat <<EOF >>/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 <<EOF >>/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