From f2c7bcb78d8d7094a966d69e9b1b000ed098a487 Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Thu, 10 Mar 2022 11:55:37 +0100
Subject: [PATCH 1/2] jenkins/kola/aws: run tests on additional instance types

There was a regression for an instance type which could have been
prevented by testing.
Add the same extended test logic used for Equinix Metal to AWS.
---
 jenkins/kola/aws.sh | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/jenkins/kola/aws.sh b/jenkins/kola/aws.sh
index 99a741ae57..b8d48a23e7 100755
--- a/jenkins/kola/aws.sh
+++ b/jenkins/kola/aws.sh
@@ -44,6 +44,32 @@ if [[ "${AWS_AMI_ID}" == "" ]]; then
   echo "Created new AMI ${AWS_AMI_ID} (will be removed after testing)"
 fi
 
+# Run the cl.internet test on multiple machine types only if it should run in general
+cl_internet_included="$(set -o noglob; bin/kola list --platform=aws --filter ${KOLA_TESTS} | { grep cl.internet || true ; } )"
+if [[ "${BOARD}" == "amd64-usr" ]] && [[ "${cl_internet_included}" != ""  ]]; then
+  for INSTANCE in m4.2xlarge; do
+    (
+    OUTPUT=$(timeout --signal=SIGQUIT 6h bin/kola run \
+    --parallel=8 \
+    --basename="${NAME}" \
+    --board="${BOARD}" \
+    --aws-ami="${AWS_AMI_ID}" \
+    --aws-region="${AWS_REGION}" \
+    --aws-type="${INSTANCE}" \
+    --aws-iam-profile="${AWS_IAM_PROFILE}" \
+    --platform=aws \
+    --channel="${GROUP}" \
+    --offering="${OFFER}" \
+    --tapfile="${JOB_NAME##*/}_validate_${INSTANCE}.tap" \
+    --torcx-manifest=torcx_manifest.json \
+    cl.internet 2>&1 || true)
+    echo "=== START $INSTANCE ==="
+    echo "${OUTPUT}" | sed "s/^/${INSTANCE}: /g"
+    echo "=== END $INSTANCE ==="
+    ) &
+  done
+fi
+
 # Do not expand the kola test patterns globs
 set -o noglob
 timeout --signal=SIGQUIT 6h bin/kola run \
@@ -61,3 +87,6 @@ timeout --signal=SIGQUIT 6h bin/kola run \
     --torcx-manifest=torcx_manifest.json \
     ${KOLA_TESTS}
 set +o noglob
+
+# wait for the cl.internet test results
+wait

From d26530d4cb8e4fd648f658d2164a88b617819bcd Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Thu, 10 Mar 2022 15:42:45 +0100
Subject: [PATCH 2/2] jenkins/kola/packet|aws: silence debug output of
 concurrent test

The concurrent tests' debug output is not helping and causes confusion.
---
 jenkins/kola/aws.sh    | 1 +
 jenkins/kola/packet.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/jenkins/kola/aws.sh b/jenkins/kola/aws.sh
index b8d48a23e7..fcb417e9df 100755
--- a/jenkins/kola/aws.sh
+++ b/jenkins/kola/aws.sh
@@ -49,6 +49,7 @@ cl_internet_included="$(set -o noglob; bin/kola list --platform=aws --filter ${K
 if [[ "${BOARD}" == "amd64-usr" ]] && [[ "${cl_internet_included}" != ""  ]]; then
   for INSTANCE in m4.2xlarge; do
     (
+    set +x
     OUTPUT=$(timeout --signal=SIGQUIT 6h bin/kola run \
     --parallel=8 \
     --basename="${NAME}" \
diff --git a/jenkins/kola/packet.sh b/jenkins/kola/packet.sh
index 9b8f7e9043..9b98c9560f 100755
--- a/jenkins/kola/packet.sh
+++ b/jenkins/kola/packet.sh
@@ -48,6 +48,7 @@ cl_internet_included="$(set -o noglob; bin/kola list --platform=packet --filter
 if [[ "${BOARD}" == "amd64-usr" ]] && [[ "${cl_internet_included}" != ""  ]]; then
   for INSTANCE in c3.medium.x86 m3.large.x86 s3.xlarge.x86 n2.xlarge.x86; do
     (
+    set +x
     OUTPUT=$(timeout --signal=SIGQUIT "${timeout}" bin/kola run \
     --basename="${NAME}" \
     --board="${BOARD}" \