Skip to content

Commit

Permalink
Bumped CI ubuntu from 20 to 22
Browse files Browse the repository at this point in the history
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
  • Loading branch information
craigcomstock committed Dec 13, 2024
1 parent df66392 commit 26014ae
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ci/Dockerfile-cfengine-build-package
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile-cfengine-deployment-tests
Original file line number Diff line number Diff line change
@@ -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" ]
4 changes: 2 additions & 2 deletions ci/README
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/docker-build-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion ci/setup.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# setup build host on ubuntu 20
# setup build host on ubuntu 22
set -ex
PREFIX=/var/cfengine

Expand Down

0 comments on commit 26014ae

Please sign in to comment.