Skip to content

K
k3s
Commit aa260f50 authored by Wojciech Tyczynski's avatar Wojciech Tyczynski Committed by GitHub
Browse files
Options

Merge pull request #30749 from wojtek-t/fix_serial_mode

Revert part of #30424
parents 5e9695d5 1b533338
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/jenkins/dockerized-e2e-runner.sh
View file @ aa260f50
...@@ -35,7 +35,6 @@ env \ ...@@ -35,7 +35,6 @@ env \
-u PATH \ -u PATH \
-u PWD \ -u PWD \
-u WORKSPACE \ -u WORKSPACE \
-u GOROOT \
>${WORKSPACE}/env.list >${WORKSPACE}/env.list
docker_extra_args=() docker_extra_args=()
...@@ -63,4 +62,5 @@ docker run --rm=true -i \ ...@@ -63,4 +62,5 @@ 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-e2e:v20160810 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')"
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