github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Only build essential targets for node e2e 

Also clean up a log message
pull/6/head
Tim St. Clair 2016-06-03 17:49:04 -07:00
parent 015bc3d60d
commit bdff676425
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/e2e_node/e2e_build.go
View File

@ -30,13 +30,19 @@ import (
var k8sBinDir = flag.String("k8s-bin-dir", "", "Directory containing k8s kubelet and kube-apiserver binaries.") var k8sBinDir = flag.String("k8s-bin-dir", "", "Directory containing k8s kubelet and kube-apiserver binaries.")
var buildTargets = []string{
"cmd/kubelet",
"cmd/kube-apiserver",
"test/e2e_node/e2e_node.test",
}
func buildGo() { func buildGo() {
glog.Infof("Building k8s binaries...") glog.Infof("Building k8s binaries...")
k8sRoot, err := getK8sRootDir() k8sRoot, err := getK8sRootDir()
if err != nil { if err != nil {
glog.Fatalf("Failed to locate kubernetes root directory %v.", err) glog.Fatalf("Failed to locate kubernetes root directory %v.", err)
} }
cmd := exec.Command(filepath.Join(k8sRoot, "hack/build-go.sh")) cmd := exec.Command(filepath.Join(k8sRoot, "hack/build-go.sh"), buildTargets...)
cmd.Stdout = os.Stdout cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
err = cmd.Run() err = cmd.Run()
@ -53,7 +59,7 @@ func getK8sBin(bin string) (string, error) {
return "", err return "", err
} }
if _, err := os.Stat(filepath.Join(*k8sBinDir, bin)); err != nil { if _, err := os.Stat(filepath.Join(*k8sBinDir, bin)); err != nil {
return "", fmt.Errorf("Could not find kube-apiserver under directory %s.", absPath) return "", fmt.Errorf("Could not find %s under directory %s.", bin, absPath)
} }
return filepath.Join(absPath, bin), nil return filepath.Join(absPath, bin), nil
} }