Fixed debian-9 bootstrap host setup without quick install script

Ticket: ENT-13483
Changelog: none

Author: craigcomstock

ci/cfengine-build-host-setup.cf

@@ -45,7 +45,10 @@ bundle agent cfengine_build_host_setup
       "python3-psycopg2";
       "rsync" comment => "added for debian-10";
       "systemd-coredump" comment => "added step to jenkins testing-pr job to query for coredumps on failures";
+
 # core/ci/dependencies.sh is run on some systems where quickinstall and cf-remote cannot install an agent to run this policy so we must remove some system packages that we also build since both install to /usr as a prefix.
+# we do need these still installed on bootstrap-pr hosts though, so guard against that class
+    debian.!bootstrap_pr_host::
       "libattr1-dev" package_policy => "delete";
       "libssl-dev" package_policy => "delete";
       "libpcre2-dev" package_policy => "delete";
@@ -69,6 +72,7 @@ bundle agent cfengine_build_host_setup
     (debian_10|debian_11).systemssl_build_host::
       "libssl-dev";
     debian.bootstrap_pr_host::
+      "libssl-dev"; # bootstrap_pr host needs this to configure before we build openssl ourselves
       "librsync-dev"; # bootstrap_pr host needs this to run configure and make dist
       "autoconf-archive" comment => "Required to resolve the AX_PTHREAD macro";
 

ci/setup-cfengine-build-host.sh

@@ -86,6 +86,9 @@ if [ -f /etc/os-release ]; then
   elif grep debian /etc/os-release; then
     DEBIAN_FRONTEND=noninteractive apt upgrade --yes && DEBIAN_FRONTEND=noninteractive apt autoremove --yes
     alias software='DEBIAN_FRONTEND=noninteractive apt install --yes'
+    if grep stretch /etc/os-release; then
+      DEBIAN_STRETCH=1 # special case, cf-remote install needs to NOT use master as there are no packages there
+    fi
   elif grep suse /etc/os-release; then
     zypper -n update
     alias software='zypper install -y'
@@ -162,7 +165,12 @@ else
   # We need a cf-agent to run build host setup policy and redhat-10-arm did not have a previous package to install.
   if ! /var/cfengine/bin/cf-agent -V; then
     echo "No existing CFEngine install found, try cf-remote..."
-    cf-remote --log-level info --version master install --clients localhost || true
+    if [ -n "$DEBIAN_STRETCH" ]; then
+      _VERSION="--version 3.21.8"
+    else
+      _VERSION="--version master"
+    fi
+    cf-remote --log-level info $_VERSION install --clients localhost || true
   fi
 fi