From 49210bd8b580c1464360c7db0c16ef409cc36ad9 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Fri, 29 Jan 2021 15:07:03 -0800 Subject: [PATCH] Revert timings back to how they are at HEAD --- hack/jenkins/common.sh | 4 ++-- test/integration/net_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hack/jenkins/common.sh b/hack/jenkins/common.sh index fba415cdc5..0182427673 100755 --- a/hack/jenkins/common.sh +++ b/hack/jenkins/common.sh @@ -31,7 +31,7 @@ export GOPATH="$HOME/go" export KUBECONFIG="${TEST_HOME}/kubeconfig" export PATH=$PATH:"/usr/local/bin/:/usr/local/go/bin/:$GOPATH/bin" -readonly TIMEOUT=${1:-200m} +readonly TIMEOUT=${1:-70m} if [ "$(uname)" != "Darwin" ]; then # install lsof for finding none driver procs, psmisc to use pstree in cronjobs @@ -308,7 +308,7 @@ fi ${SUDO_PREFIX}${E2E_BIN} \ -minikube-start-args="--driver=${VM_DRIVER} ${EXTRA_START_ARGS}" \ - -test.timeout=120m -test.v \ + -test.timeout=${TIMEOUT} -test.v \ ${EXTRA_TEST_ARGS} \ -binary="${MINIKUBE_BIN}" 2>&1 | tee "${TEST_OUT}" diff --git a/test/integration/net_test.go b/test/integration/net_test.go index fa78212b03..9fff54dc56 100644 --- a/test/integration/net_test.go +++ b/test/integration/net_test.go @@ -70,10 +70,10 @@ func TestNetworkPlugins(t *testing.T) { MaybeParallel(t) profile := UniqueProfileName(tc.name) - ctx, cancel := context.WithTimeout(context.Background(), Minutes(30)) + ctx, cancel := context.WithTimeout(context.Background(), Minutes(40)) defer CleanupWithLogs(t, profile, cancel) - startArgs := append([]string{"start", "-p", profile, "--memory=1800", "--alsologtostderr", "--wait=true", "--wait-timeout=3m"}, tc.args...) + startArgs := append([]string{"start", "-p", profile, "--memory=1800", "--alsologtostderr", "--wait=true", "--wait-timeout=5m"}, tc.args...) startArgs = append(startArgs, StartArgs()...) t.Run("Start", func(t *testing.T) { @@ -158,7 +158,7 @@ func TestNetworkPlugins(t *testing.T) { } // If the coredns process was stable, this retry wouldn't be necessary. - if err := retry.Expo(nslookup, 1*time.Second, Minutes(1)); err != nil { + if err := retry.Expo(nslookup, 1*time.Second, Minutes(6)); err != nil { t.Errorf("failed to do nslookup on kubernetes.default: %v", err) }