From 5998a590fa363d880e45d89072c16f37f04c9c20 Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Wed, 8 Nov 2017 11:12:12 +0000 Subject: [PATCH 1/2] Show minikube logs if it fails to start up --- hack/install-e2e-dependencies.sh | 10 ++++++++++ hack/prepare-e2e.sh | 3 --- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/hack/install-e2e-dependencies.sh b/hack/install-e2e-dependencies.sh index c6005696e..559f0735a 100755 --- a/hack/install-e2e-dependencies.sh +++ b/hack/install-e2e-dependencies.sh @@ -1,3 +1,6 @@ +#!/bin/bash +# +# Install e2e test dependencies on Travis set -eux curl -Lo helm.tar.gz \ https://storage.googleapis.com/kubernetes-helm/helm-v2.6.1-linux-amd64.tar.gz @@ -23,3 +26,10 @@ sudo -E CHANGE_MINIKUBE_NONE_USER=true minikube start \ --vm-driver=none \ --kubernetes-version="$KUBERNETES_VERSION" \ --extra-config=apiserver.Authorization.Mode=RBAC + +echo "Waiting up to 5 minutes for Kubernetes to be ready..." +if ! retry TIMEOUT=300 kubectl get nodes; then + minikube logs + echo "ERROR: Timeout waiting for Minikube to be ready" + exit 1 +fi diff --git a/hack/prepare-e2e.sh b/hack/prepare-e2e.sh index 1ccedd732..4397ddb03 100755 --- a/hack/prepare-e2e.sh +++ b/hack/prepare-e2e.sh @@ -5,9 +5,6 @@ SCRIPT_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" source "${SCRIPT_DIR}/libe2e.sh" -echo "Waiting up to 10 minutes for Kubernetes to be ready..." -retry TIMEOUT=600 kubectl get nodes - echo "Installing helm..." cat < Date: Wed, 8 Nov 2017 11:28:32 +0000 Subject: [PATCH 2/2] Import the retry function --- hack/install-e2e-dependencies.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hack/install-e2e-dependencies.sh b/hack/install-e2e-dependencies.sh index 559f0735a..6ddd3cf86 100755 --- a/hack/install-e2e-dependencies.sh +++ b/hack/install-e2e-dependencies.sh @@ -2,6 +2,10 @@ # # Install e2e test dependencies on Travis set -eux + +SCRIPT_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)" +source "${SCRIPT_DIR}/libe2e.sh" + curl -Lo helm.tar.gz \ https://storage.googleapis.com/kubernetes-helm/helm-v2.6.1-linux-amd64.tar.gz tar xvf helm.tar.gz