use --cpus=max and increase functional test timeout

kubernetes · Jul 18, 2024 · 770a937 · 770a937
1 parent 4c452c9
commit 770a937
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -702,7 +702,7 @@ jobs:
           chmod a+x minikube-*
           MINIKUBE_HOME=$(pwd)/testhome ./minikube-darwin-arm64 delete --all --purge
           START_TIME=$(date -u +%s)
-          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-arm64 -minikube-start-args="--driver=qemu --wait-timeout=20m"  -test.run "TestFunctional" -test.timeout=110m -test.v -timeout-multiplier=1.5 -binary=./minikube-darwin-arm64 2>&1 | tee ./report/testout.txt
+          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-arm64 -minikube-start-args="--driver=qemu --wait-timeout=20m --cpus=max"  -test.run "TestFunctional" -test.timeout=110m -test.v -timeout-multiplier=1.5 -binary=./minikube-darwin-arm64 2>&1 | tee ./report/testout.txt
           END_TIME=$(date -u +%s)
           TIME_ELAPSED=$(($END_TIME-$START_TIME))
           min=$((${TIME_ELAPSED}/60))

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -700,7 +700,7 @@ jobs:
           chmod a+x minikube-*
           MINIKUBE_HOME=$(pwd)/testhome ./minikube-darwin-arm64 delete --all --purge
           START_TIME=$(date -u +%s)
-          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-arm64 -minikube-start-args="--driver=qemu --wait-timeout=20m"  -test.run "TestFunctional" -test.timeout=110m -test.v -timeout-multiplier=1.5 -binary=./minikube-darwin-arm64 2>&1 | tee ./report/testout.txt
+          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-arm64 -minikube-start-args="--driver=qemu --wait-timeout=20m --cpus=max"  -test.run "TestFunctional" -test.timeout=110m -test.v -timeout-multiplier=1.5 -binary=./minikube-darwin-arm64 2>&1 | tee ./report/testout.txt
           END_TIME=$(date -u +%s)
           TIME_ELAPSED=$(($END_TIME-$START_TIME))
           min=$((${TIME_ELAPSED}/60))

diff --git a/test/integration/functional_test.go b/test/integration/functional_test.go
@@ -74,7 +74,7 @@ var runCorpProxy = detect.GithubActionRunner() && runtime.GOOS == "linux" && !ar
 func TestFunctional(t *testing.T) {
 
 	profile := UniqueProfileName("func")
-	ctx, cancel := context.WithTimeout(context.Background(), Minutes(40))
+	ctx, cancel := context.WithTimeout(context.Background(), Minutes(65))
 	defer func() {
 		if !*cleanup {
 			return