From f9541f44477edbd6245955bb7d3fc74e57529d77 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 14:30:06 -0500 Subject: [PATCH 1/5] fix: build host setup: newer debian needs python-is-python3 package for buildscripts/build-scripts/get_labels_expr.py Ticket: none Changelog: none --- ci/cfengine-build-host-setup.cf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ci/cfengine-build-host-setup.cf b/ci/cfengine-build-host-setup.cf index 4f100eb48..1127f899a 100644 --- a/ci/cfengine-build-host-setup.cf +++ b/ci/cfengine-build-host-setup.cf @@ -17,6 +17,10 @@ bundle agent cfengine_build_host_setup debian.(!debian_13.!debian_12.!ubuntu_22.!ubuntu_24.!ubuntu_25):: "python" comment => "debian>=12 and ubuntu>=22 only has python3"; + debian.(!debian_9.!debian_10.!debian_11.!ubuntu_20.!ubuntu_18.!ubuntu_16):: + "python3"; + "python-is-python3" comment => "pipeline hosts need plain old python for buildscripts/build-scripts/get_labels_expr.py"; + debian_13|ubuntu_25:: "ntpsec"; From 8e7ed0ec6e906aee0fac633c8f42232c464aef8e Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 14:31:11 -0500 Subject: [PATCH 2/5] fix: added groovy install to build host setup for containers to run flake checks Ticket: ENT-13763 Changelog: none --- ci/cfengine-build-host-setup.cf | 3 +++ ci/linux-install-groovy.sh | 13 +++++++++++++ 2 files changed, 16 insertions(+) create mode 100755 ci/linux-install-groovy.sh diff --git a/ci/cfengine-build-host-setup.cf b/ci/cfengine-build-host-setup.cf index 1127f899a..b2d844ffe 100644 --- a/ci/cfengine-build-host-setup.cf +++ b/ci/cfengine-build-host-setup.cf @@ -214,6 +214,7 @@ bundle agent cfengine_build_host_setup "have_tmp_mount" expression => returnszero("mount | grep '/tmp'", "useshell"); "have_coredumpctl" expression => returnszero("command -v coredumpctl", "useshell"); "missing_java" expression => not(fileexists("/usr/bin/java")); + "missing_groovy" expression => not(fileexists("/usr/bin/groovy")); (redhat|centos).!(redhat_6|centos_6|redhat_7|centos_7):: "yum_conf_ok" expression => returnszero("grep best=False /etc/yum.conf >/dev/null", "useshell"); redhat_6|centos_6|redhat_7|centos_7:: @@ -250,6 +251,8 @@ bundle agent cfengine_build_host_setup "sysctl kernel.core_pattern='|/lib/systemd/systemd-coredump %p %u %g %s %t %e'" -> { "ENT-12669" } comment => "Ensure that core_pattern is proper for systemd-coredump if coredumpctl is present.", contain => in_shell; + containers_host.missing_groovy:: + "sh $(this.promise_dirname)/linux-install-groovy.sh" contain => in_shell; missing_java:: "sh $(this.promise_dirname)/linux-install-jdk21.sh" contain => in_shell; (redhat_7|centos_7|redhat_8|centos_8|redhat_9|redhat_10).(!have_development_tools).(yum_dnf_conf_ok):: diff --git a/ci/linux-install-groovy.sh b/ci/linux-install-groovy.sh new file mode 100755 index 000000000..3858c76d0 --- /dev/null +++ b/ci/linux-install-groovy.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +groovy_version=5.0.3 +groovy_zip="apache-groovy-binary-$groovy_version.zip" +cd /opt +rm -rf apache-groovy-binary*zip +wget https://groovy.jfrog.io/artifactory/dist-release-local/groovy-zips/"$groovy_zip" +echo "9d711dcb1dea94df9119558365beb6ac2909a22e30b58ae31de8bcb0dcf33698" "$groovy_zip" > "$groovy_zip".sha256 +sha256sum -c "$groovy_zip".sha256 +unzip -o "$groovy_zip" +ln -sf /opt/groovy-"$groovy_version"/bin/groovy /usr/bin/ +echo "export JAVA_HOME=/usr" >> /etc/profile +. /etc/profile +groovy -v From e68cc90824bceec9ffbf28c315aff019a92a44f7 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 14:31:49 -0500 Subject: [PATCH 3/5] fix: ci/cfengine-build-host-setup.cf --installed not supported on centos-7 Ticket: ENT-13763 Changelog: none --- ci/cfengine-build-host-setup.cf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cfengine-build-host-setup.cf b/ci/cfengine-build-host-setup.cf index b2d844ffe..2f1b7acd3 100644 --- a/ci/cfengine-build-host-setup.cf +++ b/ci/cfengine-build-host-setup.cf @@ -222,7 +222,7 @@ bundle agent cfengine_build_host_setup redhat_8|centos_8:: "have_fakeroot" expression => returnszero("command -v fakeroot >/dev/null", "useshell"); (redhat|centos):: - "epel_release_ok" expression => returnszero("yum info --installed epel-release", "useshell"); + "epel_release_ok" expression => returnszero("yum info installed epel-release", "useshell"); (redhat_8|centos_8).have_perl:: "have_data_dumper" expression => returnszero("cpan -l | grep Data::Dumper", "useshell"); "have_data_dumper_names" expression => returnszero("cpan -l | grep Data::Dumper::Names", "useshell"); From d7d4cd6c386fdb6614cde8f352ad1bfe0349e4c4 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 14:33:32 -0500 Subject: [PATCH 4/5] fix: Added LC_ALL=C to /etc/environment in ci/cfengine-build-host-setup.cf to workaround new jenkins access strategy for build hosts Ticket: ENT-13763 Changelog: none --- ci/cfengine-build-host-setup.cf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/cfengine-build-host-setup.cf b/ci/cfengine-build-host-setup.cf index 2f1b7acd3..1e530948f 100644 --- a/ci/cfengine-build-host-setup.cf +++ b/ci/cfengine-build-host-setup.cf @@ -295,6 +295,11 @@ bundle agent cfengine_build_host_setup "have_$(suse_users_and_groups)_user" expression => returnszero("grep '^$(suse_users_and_groups):' /etc/passwd >/dev/null", "useshell"); files: + redhat:: + "/etc/environment" + edit_line => contains_literal_string("LC_ALL=C"), + comment => "It seems that centos-7 at least needs LC_ALL=C now, maybe due to different way we access: ProxyJump ssh commands from jenkins instead of java ssh client. 2026-04-03"; + linux:: "/home/jenkins/.ssh/known_hosts" create => "true", From 6fdc0a29837ea855077092f1e3f4bb00bb3966d0 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 28 Apr 2026 14:34:09 -0500 Subject: [PATCH 5/5] fix: ci/cfengine-build-host-setup.cf migrating from jenkins_builds user to jenkins user for container builds Ticket: ENT-13763 Changelog: none --- ci/cfengine-build-host-setup.cf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/cfengine-build-host-setup.cf b/ci/cfengine-build-host-setup.cf index 1e530948f..fd4da9f81 100644 --- a/ci/cfengine-build-host-setup.cf +++ b/ci/cfengine-build-host-setup.cf @@ -370,7 +370,7 @@ findtime = 600", %sudo ALL=NOPASSWD: /usr/bin/podman %sudo ALL=NOPASSWD: /usr/sbin/lvs %sudo ALL=NOPASSWD: /usr/bin/journalctl -jenkins_builds ALL=NOPASSWD: /usr/bin/podman +jenkins ALL=NOPASSWD: /usr/bin/podman ", create => "true", perms => mog("400", "root", "root");