Skip to content

Commit 309d74a

Browse files
author
Hantao (Will) Wang
committed
Export kubectl path to test
1 parent c17d73e commit 309d74a

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

test/k8s-integration/cluster.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ package main
22

33
import (
44
"fmt"
5+
"k8s.io/klog"
56
"os"
67
"os/exec"
78
"path/filepath"
89
"strconv"
9-
10-
"k8s.io/klog"
1110
)
1211

1312
func clusterDownGCE(k8sDir string) error {

test/k8s-integration/main.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -214,13 +214,17 @@ func handle() error {
214214
}
215215
err = buildKubernetes(testDir, "WHAT=test/e2e/e2e.test")
216216
if err != nil {
217-
return fmt.Errorf("failed to build Kubernetes: %v", err)
217+
return fmt.Errorf("failed to build Kubernetes e2e: %v", err)
218218
}
219-
// kubetest relies on ginkgo already built in the test k8s directory
219+
// kubetest relies on ginkgo and kubectl already built in the test k8s directory
220220
err = buildKubernetes(testDir, "ginkgo")
221221
if err != nil {
222222
return fmt.Errorf("failed to build gingko: %v", err)
223223
}
224+
err = buildKubernetes(testDir, "kubectl")
225+
if err != nil {
226+
return fmt.Errorf("failed to build kubectl: %v", err)
227+
}
224228
} else {
225229
testDir = k8sDir
226230
}

0 commit comments

Comments
 (0)