From e4c9165fa539b28ecfd2bdcc175a7c1e7ef9b9fa Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Tue, 10 Feb 2026 14:07:00 -0600
Subject: [PATCH 1/2] Fixed shellcheck issues in setup-cfengine-build-host.sh

Ticket: ENT-13732
Changelog: none
---
 ci/setup-cfengine-build-host.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ci/setup-cfengine-build-host.sh b/ci/setup-cfengine-build-host.sh
index 83e65211e..80c9450bf 100755
--- a/ci/setup-cfengine-build-host.sh
+++ b/ci/setup-cfengine-build-host.sh
@@ -50,6 +50,8 @@ function cleanup()
     pkill -9 cf-execd || true
   else
     echo "No pkill available. Maybe some cf procs left over?"
+    # pgrep suggestion is ignored due to wanting POSIX compatability
+    # shellcheck disable=SC2009
     ps -efl | grep cf
   fi
   ls -l /home
@@ -183,7 +185,7 @@ if ! /var/cfengine/bin/cf-agent -V; then
   else
     _VERSION=""
   fi
-  cf-remote --log-level info $_VERSION install --clients localhost || true
+  cf-remote --log-level info "$_VERSION" install --clients localhost || true
 fi
 
 if [ ! -x /var/cfengine/bin/cf-agent ]; then

From 4bc1331b0bac847134fbd8efe247cb5c71909574 Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Tue, 10 Feb 2026 14:07:26 -0600
Subject: [PATCH 2/2] Added ubuntu 16 awareness to setup-cfengine-build-host
 script

We need to install a rather older version and cf-remote won't run on this platform due to openssl dependency problems.

Ticket: ENT-13732
Changelog: none
---
 ci/setup-cfengine-build-host.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ci/setup-cfengine-build-host.sh b/ci/setup-cfengine-build-host.sh
index 80c9450bf..cabda2bd3 100755
--- a/ci/setup-cfengine-build-host.sh
+++ b/ci/setup-cfengine-build-host.sh
@@ -125,6 +125,14 @@ if grep 6.10 /etc/issue; then
   urlget https://cfengine-package-repos.s3.amazonaws.com/enterprise/Enterprise-3.24.3/misc/cfengine-masterfiles-3.24.3-1.pkg.tar.gz
 fi
 
+if grep -u ubuntu /etc/os-release; then
+  if grep -i version=\"16 /etc/os-release; then
+    urlget https://cfengine-package-repos.s3.amazonaws.com/enterprise/Enterprise-3.21.8/agent/agent_ubuntu16_x86_64/cfengine-nova_3.21.8-1.ubuntu16_amd64.deb
+    dpkg -i cfengine-nova_3.21.8-1.ubuntu16_amd64.deb
+    urlget https://cfengine-package-repos.s3.amazonaws.com/enterprise/Enterprise-3.21.8/misc/cfengine-masterfiles-3.21.8-1.pkg.tar.gz
+  fi
+fi
+
 if grep suse /etc/os-release; then
   urlget https://cfengine-package-repos.s3.amazonaws.com/pub/gpg.key
   rpm --import gpg.key