From 798b224f4154e4d554a01eecb2487360bfd0dc7d Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Wed, 31 Jan 2024 13:36:30 -0600
Subject: [PATCH] Fixup Ubuntu-16 build host setup

Ticket: ENT-11166
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 b1dca9e46..9f50ea0f1 100755
--- a/ci/setup-cfengine-build-host.sh
+++ b/ci/setup-cfengine-build-host.sh
@@ -10,6 +10,7 @@ fi
 
 function cleanup()
 {
+  set -ex
   if command -v apt 2>/dev/null; then
     sudo apt remove -y cfengine-nova || true
   elif command -v yum 2>/dev/null; then
@@ -38,7 +39,7 @@ echo "First, install any distribution upgrades"
 if grep rhel /etc/os-release; then
   sudo yum upgrade --assumeyes
 elif grep debian /etc/os-release; then
-  sudo apt upgrade --yes && sudo apt autoremove --yes
+  sudo DEBIAN_FRONTEND=noninteractive apt upgrade --yes && sudo DEBIAN_FRONTEND=noninteractive apt autoremove --yes
 elif grep suse /etc/os-release; then
   zypper -n update
 else
@@ -94,3 +95,4 @@ grep -i error: promises.log && exit 1
 sudo /var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee promises.log
 grep -i error: promises.log && exit 1
 
+exit 0