diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 2edffaafa6..4bb8b26f9c 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -260,7 +260,6 @@ cleanup_stale_routes || true mkdir -p "${TEST_HOME}" export MINIKUBE_HOME="${TEST_HOME}/.minikube" -export MINIKUBE_WANTREPORTERRORPROMPT=False export KUBECONFIG="${TEST_HOME}/kubeconfig" # Build the gvisor image. This will be copied into minikube and loaded by ctr. @@ -272,18 +271,13 @@ if [ "$(uname)" != "Darwin" ]; then docker build -t gcr.io/k8s-minikube/gvisor-addon:latest -f testdata/gvisor-addon-Dockerfile ./testdata fi - -# Display the default image URL -echo "" -echo ">> ISO URL" -"${MINIKUBE_BIN}" start -h | grep iso-url || true - echo "" echo ">> Starting ${E2E_BIN} at $(date)" ${SUDO_PREFIX}${E2E_BIN} \ -minikube-start-args="--vm-driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \ - -minikube-args="--v=10 --logtostderr ${EXTRA_ARGS}" \ - -test.v -test.timeout=100m -test.parallel=${PARALLEL_COUNT} -binary="${MINIKUBE_BIN}" && result=$? || result=$? + -test.timeout=60m \ + -test.parallel=${PARALLEL_COUNT} \ + -binary="${MINIKUBE_BIN}" && result=$? || result=$? echo ">> ${E2E_BIN} exited with ${result} at $(date)" echo "" @@ -293,7 +287,6 @@ if [[ $result -eq 0 ]]; then else status="failure" echo "minikube: FAIL" - source print-debug-info.sh fi echo ">> Cleaning up after ourselves ..." diff --git a/hack/jenkins/print-debug-info.sh b/hack/jenkins/print-debug-info.sh deleted file mode 100755 index d5b256dd59..0000000000 --- a/hack/jenkins/print-debug-info.sh +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -# Copyright 2016 The Kubernetes Authors All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Prints some debug info about the state of the cluster -# -# We don't check the error on these commands, since they might fail depending on -# the cluster state. -set +e - -echo "" -echo ">>> print-debug-info at $(date):" -echo "" -${SUDO_PREFIX} cat "${KUBECONFIG}" -kubectl version \ - && kubectl get pods --all-namespaces \ - && kubectl cluster-info dump - -# minikube has probably been shut down, so iterate forward each command rather than spamming. -MINIKUBE=${SUDO_PREFIX}out/minikube-${OS_ARCH} -${MINIKUBE} status -${MINIKUBE} ip && ${MINIKUBE} logs - -if [[ "${VM_DRIVER}" == "none" ]]; then - run="" -else - run="${MINIKUBE} ssh --" -fi - -echo "Local date: $(date)" -${run} date -${run} uptime -${run} docker ps -${run} env TERM=dumb systemctl list-units --state=failed -${run} env TERM=dumb journalctl --no-tail --no-pager -p notice -${run} free -${run} cat /etc/VERSION - -if type -P virsh; then - virsh -c qemu:///system list --all -fi - -if type -P vboxmanage; then - vboxmanage list vms -fi - -if type -P hdiutil; then - hdiutil info | grep -E "/dev/disk[1-9][^s]" -fi - -netstat -rn -f inet - -echo "" -echo ">>> end print-debug-info" -echo "" -set -e