From 30ebeaf3ba004b94e90489f3ffd9d43f9c9cc842 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Tue, 10 Feb 2026 10:11:09 -0600
Subject: [PATCH 1/3] Added safeguard to static-check runner in case of 1 proc
 host

Ticket: ENT-13730
Changelog: none
(cherry picked from commit 070b450d5c48aa662a485cd1b5c89a09be123784)
---
 tests/static-check/run_checks.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/static-check/run_checks.sh b/tests/static-check/run_checks.sh
index f5bc3319a3..b7e7c39325 100755
--- a/tests/static-check/run_checks.sh
+++ b/tests/static-check/run_checks.sh
@@ -4,6 +4,9 @@ set -x
 
 n_procs="$(getconf _NPROCESSORS_ONLN)"
 use_procs=$((n_procs/2))
+if [ "$use_procs" -lt "0" ]; then
+  use_procs=1
+fi
 
 function check_with_gcc() {
   # previous runs may have cached configuration based on a different CC

From 2076c43e8fecf4fd0d4a71d6c45d386b29759d80 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Wed, 11 Feb 2026 16:22:04 -0600
Subject: [PATCH 2/3] Adjusted startup timeout for valgrind-checks test to 4
 minutes from 2

In CI we like to use some pretty slow machines so give it some more time and see if things work out.

Ticket: ENT-13730
Changelog: none
(cherry picked from commit 690a3249fef8ce30a1b8551e66b2d5bfbe6b1190)
---
 tests/valgrind-check/valgrind.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/valgrind-check/valgrind.sh b/tests/valgrind-check/valgrind.sh
index 34716fec64..62d02a7fb1 100644
--- a/tests/valgrind-check/valgrind.sh
+++ b/tests/valgrind-check/valgrind.sh
@@ -124,7 +124,7 @@ print_ps
 # cf-serverd running under valgrind can be really slow to start, let's give it
 # some time before we move on and potentially hit the wall if it's actually
 # malfunctioning
-tries=12 # max 2 minutes
+tries=24 # max 4 minutes
 while /var/cfengine/bin/cf-net -H $BOOTSTRAP_IP connect | grep Failed; do
   tries=$((tries - 1))
   if [ $tries -le 0 ]; then

From 74a224cb228f487c0c14693d5333e64834a67845 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Thu, 12 Feb 2026 10:24:35 -0600
Subject: [PATCH 3/3] Fixed which branches run github CI, bump for 3.27 release

Ticket: none
Changelog: none
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 05ad8fbd5c..820d51404e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ on:
   # run this workflow on pull_request activity
   # this includes opening and pushing more commits
   pull_request:
-    branches: [ master, 3.24.x, 3.21.x ]
+    branches: [ master, 3.27.x, 3.24.x ]
 
 jobs:
   unit_tests: