Skip to content

K
k3s
Commit 55dc6f67 authored by Lantao Liu's avatar Lantao Liu
Browse files
Options

Let local node e2e return error.

Signed-off-by: 's avatarLantao Liu <lantaol@google.com>
parent 1a44e266
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
test/e2e_node/runner/local/run_local.go
View file @ 55dc6f67
...@@ -57,16 +57,18 @@ func main() { ...@@ -57,16 +57,18 @@ func main() {
ginkgo := filepath.Join(outputDir, "ginkgo") ginkgo := filepath.Join(outputDir, "ginkgo")
test := filepath.Join(outputDir, "e2e_node.test") test := filepath.Join(outputDir, "e2e_node.test")
if *systemSpecName == "" { args := []string{*ginkgoFlags, test, "--", *testFlags}
runCommand(ginkgo, *ginkgoFlags, test, "--", *testFlags) if *systemSpecName != "" {
return rootDir, err := builder.GetK8sRootDir()
if err != nil {
glog.Fatalf("Failed to get k8s root directory: %v", err)
}
systemSpecFile := filepath.Join(rootDir, systemSpecPath, *systemSpecName+".yaml")
args = append(args, fmt.Sprintf("--system-spec-name=%s --system-spec-file=%s", *systemSpecName, systemSpecFile))
} }
rootDir, err := builder.GetK8sRootDir() if err := runCommand(ginkgo, args...); err != nil {
if err != nil { glog.Exitf("Test failed: %v", err)
glog.Fatalf("Failed to get k8s root directory: %v", err)
} }
systemSpecFile := filepath.Join(rootDir, systemSpecPath, *systemSpecName+".yaml")
runCommand(ginkgo, *ginkgoFlags, test, "--", fmt.Sprintf("--system-spec-name=%s --system-spec-file=%s", *systemSpecName, systemSpecFile), *testFlags)
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment