From cf20c21ef82e19ffc98bffcc3e94a2afc91e6271 Mon Sep 17 00:00:00 2001 From: Benjamin Elder Date: Fri, 14 Mar 2025 09:42:04 -0700 Subject: [PATCH] Revert "stop overriding max concurrency in CI, let automax procs handle it" This reverts changes from commit 9e42056a0dfd87b94768c23d16b72ba1e7fd8213. NOTE: this is not a clean revert bcause of further changes. --- hack/jenkins/test-dockerized.sh | 4 ++++ hack/jenkins/test-integration-dockerized.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/hack/jenkins/test-dockerized.sh b/hack/jenkins/test-dockerized.sh index 72b6884b30b..c4c34061512 100755 --- a/hack/jenkins/test-dockerized.sh +++ b/hack/jenkins/test-dockerized.sh @@ -25,6 +25,10 @@ set -x; # TODO: make test-integration should handle this automatically source ./hack/install-etcd.sh +# TODO: drop KUBE_INTEGRATION_TEST_MAX_CONCURRENCY later when we've figured out +# stabilizing the tests / CI Setting this to a hardcoded value is fragile. +export KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 + # Save the verbose stdout as well. export KUBE_KEEP_VERBOSE_TEST_OUTPUT=y export LOG_LEVEL=4 diff --git a/hack/jenkins/test-integration-dockerized.sh b/hack/jenkins/test-integration-dockerized.sh index ec856abc3bd..1ca0ddf1e66 100755 --- a/hack/jenkins/test-integration-dockerized.sh +++ b/hack/jenkins/test-integration-dockerized.sh @@ -26,4 +26,8 @@ set -x; # TODO: make test-integration should handle this automatically source ./hack/install-etcd.sh +# TODO: drop KUBE_INTEGRATION_TEST_MAX_CONCURRENCY later when we've figured out +# stabilizing the tests / CI Setting this to a hardcoded value is fragile. +export KUBE_INTEGRATION_TEST_MAX_CONCURRENCY=4 + make test-integration KUBE_KEEP_VERBOSE_TEST_OUTPUT=y LOG_LEVEL=4