Merge pull request kubernetes#130396 from bart0sh/PR173-e2e_node-fix-getting-pod-logs

k8s-ci-robot · web-flow · commit 74cb75c88458 · 2025-03-07T05:21:45.000-08:00
e2e_node: remote: fix getting pod logs
diff --git a/test/e2e_node/remote/remote.go b/test/e2e_node/remote/remote.go
@@ -239,9 +239,12 @@ func getTestArtifacts(host, testDir string) error {
 		}
 	}
 	// Copy container logs to artifacts/hostname
-	if _, err := SSH(host, "chmod", "-R", "a+r", "/var/log/pods"); err == nil {
-		if _, err = runSSHCommand(host, "scp", "-r", fmt.Sprintf("%s:/var/log/pods/", GetHostnameOrIP(host)), logPath); err != nil {
-			return err
+	klog.V(4).Info("Add 'execute' permission to /var/log/pods to copy logs")
+	if _, err := SSH(host, "chmod", "o+x", "/var/log/pods"); err == nil {
+		if _, err := SSH(host, "chmod", "-R", "a+r", "/var/log/pods"); err == nil {
+			if _, err = runSSHCommand(host, "scp", "-r", fmt.Sprintf("%s:/var/log/pods/", GetHostnameOrIP(host)), logPath); err != nil {
+				return err
+			}
 		}
 	}
 	return nil

Original file line number	Diff line number	Diff line change
`@@ -239,9 +239,12 @@ func getTestArtifacts(host, testDir string) error {`
`239`	`239`	`}`
`240`	`240`	`}`
`241`	`241`	`// Copy container logs to artifacts/hostname`
`242`		`- if _, err := SSH(host, "chmod", "-R", "a+r", "/var/log/pods"); err == nil {`
`243`		`- if _, err = runSSHCommand(host, "scp", "-r", fmt.Sprintf("%s:/var/log/pods/", GetHostnameOrIP(host)), logPath); err != nil {`
`244`		`- return err`
	`242`	`+ klog.V(4).Info("Add 'execute' permission to /var/log/pods to copy logs")`
	`243`	`+ if _, err := SSH(host, "chmod", "o+x", "/var/log/pods"); err == nil {`
	`244`	`+ if _, err := SSH(host, "chmod", "-R", "a+r", "/var/log/pods"); err == nil {`
	`245`	`+ if _, err = runSSHCommand(host, "scp", "-r", fmt.Sprintf("%s:/var/log/pods/", GetHostnameOrIP(host)), logPath); err != nil {`
	`246`	`+ return err`
	`247`	`+ }`
`245`	`248`	`}`
`246`	`249`	`}`
`247`	`250`	`return nil`