Skip to content

K
k3s
Commit f904484b authored by Zach Loafman's avatar Zach Loafman
Browse files
Options

Merge pull request #4173 from zmerlynn/fix_jenkins_3

Revert jenkins/e2e.sh back to 606b517a, minus -tap
parents 8b25b430 c15595fd
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 9 deletions
hack/jenkins/e2e.sh
View file @ f904484b
...@@ -77,12 +77,11 @@ if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then ...@@ -77,12 +77,11 @@ if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then
export CLUSTER_API_VERSION=$(echo ${GITHASH} | cut -c 2-) export CLUSTER_API_VERSION=$(echo ${GITHASH} | cut -c 2-)
fi fi
export KUBE_CONFIG_FILE="config-test.sh" # Have cmd/e2e run by goe2e.sh generate JUnit report in ${WORKSPACE}/junit*.xml
cluster/kube-down.sh || true export E2E_REPORT_DIR=${WORKSPACE}
cluster/kube-up.sh || { echo "-- kube-up failed --"; exit 1; }
echo go run ./hack/e2e.go ${E2E_OPT} -v --down
echo "-- cluster created at $(date -Is) --" go run ./hack/e2e.go ${E2E_OPT} -v --up
echo go run ./hack/e2e.go -v --ctl="version --match-server-version=false"
cluster/kubectl.sh version || { echo "-- kubectl failed --"; exit 1; } go run ./hack/e2e.go ${E2E_OPT} -v --test
hack/ginkgo-e2e.sh --report_dir=${WORKSPACE} || { echo "-- tests failed --"; exit 1; } go run ./hack/e2e.go ${E2E_OPT} -v --down
cluster/kube-down.sh || { echo "-- kube-down failed --"; exit 1; }
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