diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index 0182427673..0e4f4e4e58 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -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 diff --git a/test/integration/helpers_test.go b/test/integration/helpers_test.go index 74bfdac5ed..c41a20a209 100644 --- a/test/integration/helpers_test.go +++ b/test/integration/helpers_test.go @@ -169,7 +169,9 @@ func Cleanup(t *testing.T, profile string, cancel context.CancelFunc) { // No helper because it makes the call log confusing. if *cleanup { t.Logf("Cleaning up %q profile ...", profile) - _, err := Run(t, exec.Command(Target(), "delete", "-p", profile)) + ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute) + defer cancel() + _, err := Run(t, exec.CommandContext(ctx, Target(), "delete", "-p", profile)) if err != nil { t.Logf("failed cleanup: %v", err) } diff --git a/test/integration/main_test.go b/test/integration/main_test.go index 58a041eb0b..922be0a969 100644 --- a/test/integration/main_test.go +++ b/test/integration/main_test.go @@ -152,10 +152,6 @@ func GithubActionRunner() bool { return os.Getenv("GITHUB_ACTIONS") == "true" } -func ContainerdContainerRuntime() bool { - return strings.Contains(*startArgs, "--container-runtime=containerd") -} - // arm64Platform returns true if running on arm64/* platform func arm64Platform() bool { return runtime.GOARCH == "arm64" diff --git a/test/integration/pause_test.go b/test/integration/pause_test.go index cd202745ee..d9214bec4e 100644 --- a/test/integration/pause_test.go +++ b/test/integration/pause_test.go @@ -29,14 +29,11 @@ import ( ) func TestPause(t *testing.T) { - if ContainerdContainerRuntime() { - t.Skip("skipping as this test currently times out on containerd") - } MaybeParallel(t) type validateFunc func(context.Context, *testing.T, string) profile := UniqueProfileName("pause") - ctx, cancel := context.WithTimeout(context.Background(), Minutes(30)) + ctx, cancel := context.WithTimeout(context.Background(), Minutes(15)) defer Cleanup(t, profile, cancel) // Serial tests