Merge pull request kubernetes#29813 from jayunit100/kill-repo-root-slb-2

Automatic merge from submit-queue [minor] couple of quick cleanups for kill reporoot quick fixes from last one, cc @spxtr @ixdy follow on to kubernetes#25584
lavalamp · Jul 30, 2016 · f0fa9e5 · f0fa9e5
2 parents 7291a43 + 4cd6bf4
commit f0fa9e5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/hack/update-bindata.sh b/hack/update-bindata.sh
@@ -16,14 +16,13 @@
 
 set -o errexit
 set -o pipefail
+set -o nounset
 
-if [[ -z ${KUBE_ROOT} ]]; then
+if [[ -z "${KUBE_ROOT:-}" ]]; then
 	echo "KUBE_ROOT not detected, setting default."
 	KUBE_ROOT="../../../"
 fi
 
-set -o nounset
-
 if [[ ! -d "${KUBE_ROOT}/examples" ]]; then
 	echo "${KUBE_ROOT}/examples not detected.  This script should be run from a location where the source dirs are available."
 	exit 1

diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go
@@ -652,11 +652,6 @@ func podFromManifest(filename string) (*api.Pod, error) {
 // Run a test container to try and contact the Kubernetes api-server from a pod, wait for it
 // to flip to Ready, log its output and delete it.
 func RunKubernetesServiceTestContainer(c *client.Client, ns string) {
-	c, err := LoadClient()
-	if err != nil {
-		Logf("Failed to load client")
-		return
-	}
 	path := "test/images/clusterapi-tester/pod.yaml"
 	p, err := podFromManifest(path)
 	if err != nil {

diff --git a/test/e2e_node/jenkins/e2e-node-jenkins.sh b/test/e2e_node/jenkins/e2e-node-jenkins.sh
@@ -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
-
 make generated_files
 
 # TODO converge build steps with hack/build-go some day if possible.