From 0085e2208dd85fe7945a4b8fb213f33534f8fc05 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Thu, 16 Nov 2017 00:41:27 +0000 Subject: [PATCH] Rename log-dump env to `LOG_DUMP_SYSTEMD_SERVICES`. --- cluster/log-dump/log-dump.sh | 2 +- test/e2e/framework/util.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/log-dump/log-dump.sh b/cluster/log-dump/log-dump.sh index 13c12e1a957..a480882f093 100755 --- a/cluster/log-dump/log-dump.sh +++ b/cluster/log-dump/log-dump.sh @@ -50,7 +50,7 @@ readonly gce_logfiles="startupscript" readonly kern_logfile="kern" readonly initd_logfiles="docker" readonly supervisord_logfiles="kubelet supervisor/supervisord supervisor/kubelet-stdout supervisor/kubelet-stderr supervisor/docker-stdout supervisor/docker-stderr" -readonly systemd_services="kubelet ${SYSTEMD_SERVICES:-docker}" +readonly systemd_services="kubelet ${LOG_DUMP_SYSTEMD_SERVICES:-docker}" # Limit the number of concurrent node connections so that we don't run out of # file descriptors for large clusters. diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index bddeeeb3637..3db6cef0169 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -4573,7 +4573,7 @@ func CoreDump(dir string) { Logf("Dumping logs locally to: %s", dir) cmd = exec.Command(path.Join(TestContext.RepoRoot, "cluster", "log-dump", "log-dump.sh"), dir) } - cmd.Env = append(os.Environ(), fmt.Sprintf("SYSTEMD_SERVICES=%s", parseSystemdServices(TestContext.SystemdServices))) + cmd.Env = append(os.Environ(), fmt.Sprintf("LOG_DUMP_SYSTEMD_SERVICES=%s", parseSystemdServices(TestContext.SystemdServices))) cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr if err := cmd.Run(); err != nil {