kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add timeouts to cleaning up

pull/10271/head
Priya Wadhwa 2021-01-29 15:10:40 -08:00
parent 49210bd8b5
commit 590376760e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/jenkins/common.sh
View File

@ -393,8 +393,8 @@ if grep -q html "$HTML_OUT"; then
fi
echo ">> Cleaning up after ourselves ..."
${SUDO_PREFIX}${MINIKUBE_BIN} tunnel --cleanup || true
${SUDO_PREFIX}${MINIKUBE_BIN} delete --all --purge >/dev/null 2>/dev/null || true
timeout 3m ${SUDO_PREFIX}${MINIKUBE_BIN} tunnel --cleanup || true
timeout 5m ${SUDO_PREFIX}${MINIKUBE_BIN} delete --all --purge >/dev/null 2>/dev/null || true
cleanup_stale_routes || true
${SUDO_PREFIX} rm -Rf "${MINIKUBE_HOME}" || true

4
test/integration/pause_test.go
View File

@ -71,7 +71,7 @@ func TestPause(t *testing.T) {
func validateFreshStart(ctx context.Context, t *testing.T, profile string) {
defer PostMortemLogs(t, profile)
args := append([]string{"start", "-p", profile, "--memory=1800", "--install-addons=false", "--wait=all", "--wait-timeout=2m"}, StartArgs()...)
args := append([]string{"start", "-p", profile, "--memory=1800", "--install-addons=false", "--wait=all"}, StartArgs()...)
rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
if err != nil {
t.Fatalf("failed to start minikube with args: %q : %v", rr.Command(), err)
@ -82,7 +82,7 @@ func validateFreshStart(ctx context.Context, t *testing.T, profile string) {
func validateStartNoReconfigure(ctx context.Context, t *testing.T, profile string) {
defer PostMortemLogs(t, profile)
args := []string{"start", "-p", profile, "--alsologtostderr", "-v=1", "--wait-timeout=2m"}
args := []string{"start", "-p", profile, "--alsologtostderr", "-v=1"}
args = append(args, StartArgs()...)
rr, err := Run(t, exec.CommandContext(ctx, Target(), args...))
if err != nil {

2
test/integration/start_stop_delete_test.go
View File

@ -94,7 +94,7 @@ func TestStartStop(t *testing.T) {
waitFlag = "--wait=apiserver,system_pods,default_sa"
}
startArgs := append([]string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", waitFlag, "--wait-timeout=2m"}, tc.args...)
startArgs := append([]string{"start", "-p", profile, "--memory=2200", "--alsologtostderr", waitFlag}, tc.args...)
startArgs = append(startArgs, StartArgs()...)
startArgs = append(startArgs, fmt.Sprintf("--kubernetes-version=%s", tc.version))