Merge pull request #1388 from craigcomstock/ENT-11166-v13

ENT-11166: Fixup Ubuntu-16 build host setup
cfengine · Jan 31, 2024 · a6882f8 · a6882f8
2 parents f6a4d2d + 798b224
commit a6882f8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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