Merge pull request kubernetes#30797 from fejta/e2e2

Automatic merge from submit-queue Unset a couple GINKGO_TEST_ARGS in kubekins-e2e Address kubernetes#30749
lavalamp · Aug 18, 2016 · 06cfb18 · 06cfb18
2 parents 83ded28 + 3b5b70a
commit 06cfb18
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/hack/jenkins/dockerized-e2e-runner.sh b/hack/jenkins/dockerized-e2e-runner.sh
@@ -30,6 +30,7 @@ mkdir -p "${HOST_ARTIFACTS_DIR}"
 : ${JENKINS_GCE_SSH_PUBLIC_KEY_FILE:='/var/lib/jenkins/gce_keys/google_compute_engine.pub'}
 
 env \
+  -u GOROOT \
   -u HOME \
   -u KUBEKINS_SERVICE_ACCOUNT_FILE \
   -u PATH \
@@ -62,5 +63,4 @@ docker run --rm=true -i \
   -e "WORKSPACE=/workspace" \
   ${KUBEKINS_SERVICE_ACCOUNT_FILE:+-e "KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"} \
   "${docker_extra_args[@]:+${docker_extra_args[@]}}" \
-  gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev3 \
-  bash -c "bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"
+  gcr.io/google_containers/kubekins-e2e:v20160817
diff --git a/hack/jenkins/e2e-image/Dockerfile b/hack/jenkins/e2e-image/Dockerfile
@@ -25,8 +25,6 @@ ENV E2E_UP=true \
 
 # Customize these as appropriate
 ENV E2E_PUBLISH_GREEN_VERSION=false \
-    GINKGO_PARALLEL_NODES=25 \
-    GINKGO_TEST_ARGS="--ginkgo.focus=\[Conformance\]" \
     INSTANCE_PREFIX=jenkins-e2e \
     KUBERNETES_PROVIDER=gce