From 5b30fd64f4a35ce6e6b942352c27dcde853e883d Mon Sep 17 00:00:00 2001 From: Thomas Stromberg Date: Thu, 16 Apr 2020 07:52:46 -0700 Subject: [PATCH] conformance: add --wait=all, reduce quirks --- hack/conformance_tests.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/hack/conformance_tests.sh b/hack/conformance_tests.sh index 3de828e59e..b4509e8e9c 100755 --- a/hack/conformance_tests.sh +++ b/hack/conformance_tests.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2019 The Kubernetes Authors All rights reserved. # @@ -27,15 +27,16 @@ set -ex -o pipefail readonly PROFILE_NAME="k8sconformance" readonly MINIKUBE=${1:-./out/minikube} shift || true -readonly START_ARGS=$* # Requires a fully running Kubernetes cluster. "${MINIKUBE}" delete -p "${PROFILE_NAME}" || true -"${MINIKUBE}" start -p "${PROFILE_NAME}" $START_ARGS +"${MINIKUBE}" start -p "${PROFILE_NAME}" --wait=all +kubectl --context "${PROFILE_NAME}" get pods --all-namespaces "${MINIKUBE}" status -p "${PROFILE_NAME}" -kubectl get pods --all-namespaces -go get -u -v github.com/heptio/sonobuoy +go get -u -v github.com/vmware-tanzu/sonobuoy + + sonobuoy run --wait outdir="$(mktemp -d)" sonobuoy retrieve "${outdir}" @@ -47,8 +48,8 @@ mkdir ./results; tar xzf *.tar.gz -C ./results version=$(${MINIKUBE} version | cut -d" " -f3) -mkdir minikube-${version} -cd minikube-${version} +mkdir "minikube-${version}" +cd "minikube-${version}" cat <PRODUCT.yaml vendor: minikube @@ -68,4 +69,4 @@ EOF cp ../results/plugins/e2e/results/* . cd .. -cp -r minikube-${version} ${cwd} +cp -r "minikube-${version}" "${cwd}"