Skip to content

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

Merge pull request #4168 from zmerlynn/fix_jenkins

Fix jenkins/hack/e2e.sh, log errors better
parents 827dcbc6 0b456e40
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
cluster/kube-up.sh
View file @ afeaf8fc
...@@ -46,3 +46,5 @@ echo "... calling setup-logging-firewall" >&2 ...@@ -46,3 +46,5 @@ echo "... calling setup-logging-firewall" >&2
setup-logging-firewall setup-logging-firewall
echo "Done" >&2 echo "Done" >&2
exit 0
hack/jenkins/e2e.sh
View file @ afeaf8fc
...@@ -78,8 +78,8 @@ if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then ...@@ -78,8 +78,8 @@ if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then
fi fi
export KUBE_CONFIG_FILE="config-test.sh" export KUBE_CONFIG_FILE="config-test.sh"
cluster/kube-down.sh cluster/kube-down.sh || true
cluster/kube-up.sh cluster/kube-up.sh || { echo "-- kube-up failed --"; exit 1; }
cluster/kubectl.sh version cluster/kubectl.sh version || { echo "-- kubectl failed --"; exit 1; }
hack/ginkgo-e2e.sh --report_dir=${WORKSPACE} hack/ginkgo-e2e.sh --report_dir=${WORKSPACE} || { echo "-- tests failed --"; exit 1; }
cluster/kube-down.sh 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