From 484b94ff7a2b5476efa723db401516ceec6ae6d2 Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Thu, 2 Jun 2022 13:59:34 +0900
Subject: [PATCH 1/3] jenkins/kola/packet.sh: Remove hardcoded arm64 parallel
 test limit

The arm64 tests on EM sometimes hit the timeout.
Remove the hardcoded limit of 3 tests to default to 4 and otherwise
use the overwritten parameter.
---
 jenkins/kola/packet.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/jenkins/kola/packet.sh b/jenkins/kola/packet.sh
index 3fb9262552..98ddb6d439 100755
--- a/jenkins/kola/packet.sh
+++ b/jenkins/kola/packet.sh
@@ -32,13 +32,8 @@ fi
 # so we override the `PACKET_REGION` to `Dallas` since it's available in this region.
 # We do not override `PACKET_REGION` for both board on top level because we need to keep proximity
 # for PXE booting.
-# We override `PARALLEL_TESTS`, because kola run with PARALLEL_TESTS >= 4 causes the
-# tests to provision >= 12 ARM servers at the same time. As the da11 region does not
-# have that many free ARM servers, the whole tests will fail. With PARALLEL_TESTS=3
-# the total number of servers stays <= 9.
 if [[ "${BOARD}" == "arm64-usr" ]]; then
   PACKET_REGION="DA"
-  PARALLEL_TESTS="3"
 fi
 
 # Run the cl.internet test on multiple machine types only if it should run in general

From 9e6a55189d4f2a78a01b60c3269a67d02723e52b Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Thu, 2 Jun 2022 14:01:11 +0900
Subject: [PATCH 2/3] jenkins/kola/azure.sh: Align the timeout with the GC
 duration

The kola test run time shouldn't be longer than the GC duration to
prevent failing tests caused by GC interference.
Align the Azure kola timeout with the GC duration.
---
 jenkins/kola/azure.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jenkins/kola/azure.sh b/jenkins/kola/azure.sh
index 26be40f401..25b1dcdf8f 100755
--- a/jenkins/kola/azure.sh
+++ b/jenkins/kola/azure.sh
@@ -32,7 +32,8 @@ fi
 
 # Do not expand the kola test patterns globs
 set -o noglob
-timeout --signal=SIGQUIT 20h bin/kola run \
+# Align timeout with ore azure gc --duration parameter
+timeout --signal=SIGQUIT 6h bin/kola run \
     --parallel="${PARALLEL}" \
     --basename="${NAME}" \
     --board="${BOARD}" \

From 77201602e78b540ff0fea3e23101aac37d30213e Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Thu, 2 Jun 2022 14:08:28 +0900
Subject: [PATCH 3/3] ci-automation/vendor-testing/azure.sh: Align timeout with
 GC duration

The kola test run time shouldn't be longer than the GC duration to
prevent failing tests caused by GC interference.
Align the Azure kola timeout with the GC duration.
---
 ci-automation/vendor-testing/azure.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci-automation/vendor-testing/azure.sh b/ci-automation/vendor-testing/azure.sh
index f7d3517769..47cc24bf66 100755
--- a/ci-automation/vendor-testing/azure.sh
+++ b/ci-automation/vendor-testing/azure.sh
@@ -50,7 +50,8 @@ run_kola_tests() {
         instance_type="${azure_instance_type}"
     fi
 
-    timeout --signal=SIGQUIT 20h \
+    # Align timeout with ore azure gc --duration parameter
+    timeout --signal=SIGQUIT 6h \
       kola run \
       --board="${board}" \
       --basename="${basename}" \