Node e2e use vendored testing packages.

This commit is contained in:
pwittrock
2016-05-31 16:35:10 +00:00
committed by Phillip Wittrock
parent 9dc06e85fb
commit c74997508e
7 changed files with 33 additions and 53 deletions

View File

@@ -57,30 +57,17 @@ func CreateTestArchive() string {
// Build the executables
buildGo()
// Build the e2e tests into an executable
glog.Infof("Building ginkgo k8s test binaries...")
testDir, err := getK8sNodeTestDir()
if err != nil {
glog.Fatalf("Failed to locate test/e2e_node directory %v.", err)
}
cmd := exec.Command("ginkgo", "build", testDir)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Run()
if err != nil {
glog.Fatalf("Failed to build e2e tests under %s %v\n", testDir, err)
}
ginkgoTest := filepath.Join(testDir, "e2e_node.test")
if _, err := os.Stat(ginkgoTest); err != nil {
glog.Fatalf("Failed to locate test binary %s", ginkgoTest)
}
defer os.Remove(ginkgoTest)
// Make sure we can find the newly built binaries
buildOutputDir, err := getK8sBuildOutputDir()
if err != nil {
glog.Fatalf("Failed to locate kubernetes build output directory %v", err)
}
ginkgoTest := filepath.Join(buildOutputDir, "e2e_node.test")
if _, err := os.Stat(ginkgoTest); err != nil {
glog.Fatalf("Failed to locate test binary %s", ginkgoTest)
}
kubelet := filepath.Join(buildOutputDir, "kubelet")
if _, err := os.Stat(kubelet); err != nil {
glog.Fatalf("Failed to locate binary %s", kubelet)

0
test/e2e_node/jenkins/copy-e2e-image.sh Normal file → Executable file
View File

View File

@@ -28,12 +28,6 @@ set -x
. $1
if [ "$INSTALL_GODEP" = true ] ; then
go get -u github.com/tools/godep
go get -u github.com/onsi/ginkgo/ginkgo
go get -u github.com/onsi/gomega
fi
go build test/e2e_node/environment/conformance.go
ARTIFACTS=${WORKSPACE}/_artifacts
mkdir -p ${ARTIFACTS}

View File

@@ -7,7 +7,6 @@ GCE_IMAGES=e2e-node-ubuntu-trusty-docker10-image,e2e-node-ubuntu-trusty-docker9-
GCE_ZONE=us-central1-f
GCE_PROJECT=kubernetes-jenkins
GCE_IMAGE_PROJECT=kubernetes-jenkins
INSTALL_GODEP=true
CLEANUP=true
GINKGO_FLAGS=
SETUP_NODE=false

View File

@@ -7,7 +7,6 @@ GCE_IMAGES=e2e-node-ubuntu-trusty-docker10-image,e2e-node-ubuntu-trusty-docker9-
GCE_ZONE=us-central1-f
GCE_PROJECT=kubernetes-jenkins-pull
GCE_IMAGE_PROJECT=kubernetes-jenkins-pull
INSTALL_GODEP=true
CLEANUP=true
GINKGO_FLAGS=
SETUP_NODE=false

View File

@@ -11,8 +11,6 @@ GCE_PROJECT=
# Gce project to use for GCE_IMAGES
# required when using GCE_IMAGES
GCE_IMAGE_PROJECT=
# If true, assume a pristine GOPATH and install necessary godeps
INSTALL_GODEP=false
# If true, delete instances created from GCE_IMAGES and files copied to GCE_HOSTS
CLEANUP=true
# If true, current user will be added to the docker group on test node