From 26014aed1dee013177dfa570bd39fd9bbed04deb Mon Sep 17 00:00:00 2001
From: Craig Comstock <craig.comstock@northern.tech>
Date: Fri, 13 Dec 2024 09:50:47 -0600
Subject: [PATCH] Bumped CI ubuntu from 20 to 22

We were getting odd errors with ldap.so for php:

/usr/lib/php/20190902/ldap.so: undefined symbol: RETURN_THROWS

Ticket: ENT-12530
Changelog: none
---
 ci/Dockerfile-cfengine-build-package    | 2 +-
 ci/Dockerfile-cfengine-deployment-tests | 2 +-
 ci/README                               | 4 ++--
 ci/docker-build-package.sh              | 2 +-
 ci/setup.sh                             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ci/Dockerfile-cfengine-build-package b/ci/Dockerfile-cfengine-build-package
index d20c1a5d9..c38137afd 100644
--- a/ci/Dockerfile-cfengine-build-package
+++ b/ci/Dockerfile-cfengine-build-package
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 RUN cat /etc/resolv.conf
 RUN bash -c 'echo "test" >/dev/tcp/archive.ubuntu.com/80'
 RUN apt-get update -y && apt-get install -y systemd wget sudo
diff --git a/ci/Dockerfile-cfengine-deployment-tests b/ci/Dockerfile-cfengine-deployment-tests
index 3cc511d1c..59c54ed7b 100644
--- a/ci/Dockerfile-cfengine-deployment-tests
+++ b/ci/Dockerfile-cfengine-deployment-tests
@@ -1,3 +1,3 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 RUN apt-get update -y && apt-get install -y systemd sudo
 CMD [ "/lib/systemd/systemd" ]
diff --git a/ci/README b/ci/README
index ba9ebad15..f8b0a1342 100644
--- a/ci/README
+++ b/ci/README
@@ -5,7 +5,7 @@ Currently a full build with no dependencies cached takes around 53 minutes with
 
 Two options: containerize build or "normal" machine (such as virtual machine or actual hardware).
 
-The build is designed for ubuntu-20.04 but could be adjusted in various shell scripts for other platforms. (TODO: do this!)
+The build is designed for ubuntu-22.04 but could be adjusted in various shell scripts for other platforms. (TODO: do this!)
 
 # containerized build
 ./clean.sh # cleans any leftover docker bits
@@ -16,7 +16,7 @@ See /data/buildscripts/ci/build.sh for required environment variables and steps
 
 # virtual or real machine
 
-For virtual machine such as with vagrant, at $NTECH_ROOT (aka top-level directory containing all CFEngine repositories), init an ubuntu-20.04 vagrant machine so it has access to all your repositories.
+For virtual machine such as with vagrant, at $NTECH_ROOT (aka top-level directory containing all CFEngine repositories), init an ubuntu-22.04 vagrant machine so it has access to all your repositories.
 
 vagrant init ubuntu/focal64
 vagrant ssh
diff --git a/ci/docker-build-package.sh b/ci/docker-build-package.sh
index 908b171dd..c02f90aae 100755
--- a/ci/docker-build-package.sh
+++ b/ci/docker-build-package.sh
@@ -8,7 +8,7 @@ COMPUTED_ROOT="$(readlink -e "$(dirname "$0")/../../")"
 NTECH_ROOT=${NTECH_ROOT:-$COMPUTED_ROOT}
 
 name=cfengine-build-package
-label=PACKAGES_HUB_x86_64_linux_ubuntu_20
+label=PACKAGES_HUB_x86_64_linux_ubuntu_22
 export JOB_BASE_NAME=label=$label
 
 
diff --git a/ci/setup.sh b/ci/setup.sh
index 6d52e31fd..4cdadc109 100755
--- a/ci/setup.sh
+++ b/ci/setup.sh
@@ -1,4 +1,4 @@
-# setup build host on ubuntu 20
+# setup build host on ubuntu 22
 set -ex
 PREFIX=/var/cfengine