Skip to content

K
k3s
Commit 06cfb189 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #30797 from fejta/e2e2

Automatic merge from submit-queue Unset a couple GINKGO_TEST_ARGS in kubekins-e2e Address #30749
parents 83ded285 3b5b70a6
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
hack/jenkins/dockerized-e2e-runner.sh
View file @ 06cfb189
...@@ -30,6 +30,7 @@ mkdir -p "${HOST_ARTIFACTS_DIR}" ...@@ -30,6 +30,7 @@ mkdir -p "${HOST_ARTIFACTS_DIR}"
: ${JENKINS_GCE_SSH_PUBLIC_KEY_FILE:='/var/lib/jenkins/gce_keys/google_compute_engine.pub'} : ${JENKINS_GCE_SSH_PUBLIC_KEY_FILE:='/var/lib/jenkins/gce_keys/google_compute_engine.pub'}
env \ env \
-u GOROOT \
-u HOME \ -u HOME \
-u KUBEKINS_SERVICE_ACCOUNT_FILE \ -u KUBEKINS_SERVICE_ACCOUNT_FILE \
-u PATH \ -u PATH \
...@@ -62,5 +63,4 @@ docker run --rm=true -i \ ...@@ -62,5 +63,4 @@ docker run --rm=true -i \
-e "WORKSPACE=/workspace" \ -e "WORKSPACE=/workspace" \
${KUBEKINS_SERVICE_ACCOUNT_FILE:+-e "KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"} \ ${KUBEKINS_SERVICE_ACCOUNT_FILE:+-e "KUBEKINS_SERVICE_ACCOUNT_FILE=/service-account.json"} \
"${docker_extra_args[@]:+${docker_extra_args[@]}}" \ "${docker_extra_args[@]:+${docker_extra_args[@]}}" \
gcr.io/google_containers/kubekins-test:go1.6.3-docker1.9.1-rev3 \ gcr.io/google_containers/kubekins-e2e:v20160817
bash -c "bash <(curl -fsS --retry 3 --keepalive-time 2 'https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh')"
hack/jenkins/e2e-image/Dockerfile
View file @ 06cfb189
...@@ -25,8 +25,6 @@ ENV E2E_UP=true \ ...@@ -25,8 +25,6 @@ ENV E2E_UP=true \
# Customize these as appropriate # Customize these as appropriate
ENV E2E_PUBLISH_GREEN_VERSION=false \ ENV E2E_PUBLISH_GREEN_VERSION=false \
GINKGO_PARALLEL_NODES=25 \
GINKGO_TEST_ARGS="--ginkgo.focus=\[Conformance\]" \
INSTANCE_PREFIX=jenkins-e2e \ INSTANCE_PREFIX=jenkins-e2e \
KUBERNETES_PROVIDER=gce KUBERNETES_PROVIDER=gce
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment