Skip to content

Commit

Permalink
Merge pull request kubernetes-csi#46 from mucahitkurt/kind-cluster-cl…
Browse files Browse the repository at this point in the history
…eanup

delete kind cluster after tests run
  • Loading branch information
k8s-ci-robot authored Nov 21, 2019
2 parents 4fcafec + 1eaaaa1 commit a41f386
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions prow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,19 @@ EOF
export KUBECONFIG
}

# Deletes kind cluster inside a prow job
delete_cluster_inside_prow_job() {
# Inside a real Prow job it is better to clean up at runtime
# instead of leaving that to the Prow job cleanup code
# because the later sometimes times out (https://github.com/kubernetes-csi/csi-release-tools/issues/24#issuecomment-554765872).
if [ "$JOB_NAME" ]; then
if kind get clusters | grep -q csi-prow; then
run kind delete cluster --name=csi-prow || die "kind delete failed"
fi
unset KUBECONFIG
fi
}

# Looks for the deployment as specified by CSI_PROW_DEPLOYMENT and CSI_PROW_KUBERNETES_VERSION
# in the given directory.
find_deployment () {
Expand Down Expand Up @@ -1017,6 +1030,7 @@ main () {
fi
fi
fi
delete_cluster_inside_prow_job
fi

if tests_need_alpha_cluster && [ "${CSI_PROW_E2E_ALPHA_GATES}" ]; then
Expand Down Expand Up @@ -1047,6 +1061,7 @@ main () {
fi
fi
fi
delete_cluster_inside_prow_job
fi
fi

Expand Down

0 comments on commit a41f386

Please sign in to comment.