Merge pull request #28259 from timstclair/node-e2e-build

Automatic merge from submit-queue

Only build essential targets for node e2e

Roll-forward of https://github.com/kubernetes/kubernetes/pull/26830 (added ginkgo to targets)
This commit is contained in:
k8s-merge-robot 2016-07-02 11:27:08 -07:00 committed by GitHub
commit d07328dc4a

View File

@ -30,13 +30,20 @@ import (
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",
"vendor/github.com/onsi/ginkgo/ginkgo",
}
func buildGo() {
glog.Infof("Building k8s binaries...")
k8sRoot, err := getK8sRootDir()
if err != nil {
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.Stderr = os.Stderr
err = cmd.Run()
@ -53,7 +60,7 @@ func getK8sBin(bin string) (string, error) {
return "", err
}
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
}