Merge pull request #764 from TeweiLuo/artifacts-dir

k8s-ci-robot · web-flow · commit 1f6315d6f76b · 2021-04-23T15:05:39.000-07:00
Use the correct log dump parameter for kubetest2.
diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go
@@ -655,7 +655,7 @@ func runTestsWithConfig(testParams *testParameters, testConfigArg, reportPrefix
 	}
 	kubeTest2Args = append(kubeTest2Args, testParams.cloudProviderArgs...)
 	if kubetestDumpDir != "" {
-		kubeTest2Args = append(kubeTest2Args, fmt.Sprintf("--log_dir=%s", kubetestDumpDir))
+		kubeTest2Args = append(kubeTest2Args, fmt.Sprintf("--artifacts=%s", kubetestDumpDir))
 	}
 	kubeTest2Args = append(kubeTest2Args, "--")
 	if len(*testVersion) != 0 && *testVersion != "master" {

Original file line number	Diff line number	Diff line change
`@@ -655,7 +655,7 @@ func runTestsWithConfig(testParams *testParameters, testConfigArg, reportPrefix`
`655`	`655`	`}`
`656`	`656`	`kubeTest2Args = append(kubeTest2Args, testParams.cloudProviderArgs...)`
`657`	`657`	`if kubetestDumpDir != "" {`
`658`		`- kubeTest2Args = append(kubeTest2Args, fmt.Sprintf("--log_dir=%s", kubetestDumpDir))`
	`658`	`+ kubeTest2Args = append(kubeTest2Args, fmt.Sprintf("--artifacts=%s", kubetestDumpDir))`
`659`	`659`	`}`
`660`	`660`	`kubeTest2Args = append(kubeTest2Args, "--")`
`661`	`661`	`if len(testVersion) != 0 && testVersion != "master" {`