From e960440f5590a934715254c194421ddff0c7af01 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 21 Apr 2026 14:48:33 -0500 Subject: [PATCH 1/2] fix: ci/cfengine-build-host-setup.cf adjusted to not install epel-release-latest rpm on centos-6 platforms 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 6bc0e2c85..5ce9d42ad 100644 --- a/ci/cfengine-build-host-setup.cf +++ b/ci/cfengine-build-host-setup.cf @@ -253,7 +253,7 @@ bundle agent cfengine_build_host_setup (redhat_8|centos_8).!have_fakeroot:: # special fakeroot, missing from _8 an d up? "sudo rpm -iv https://kojipkgs.fedoraproject.org//packages/fakeroot/1.23/1.fc29/x86_64/fakeroot-1.23-1.fc29.x86_64.rpm https://kojipkgs.fedoraproject.org//packages/fakeroot/1.23/1.fc29/x86_64/fakeroot-libs-1.23-1.fc29.x86_64.rpm" contain => in_shell; - (redhat|centos).!(redhat_7|centos_7).!epel_release_ok:: + (redhat|centos).!(redhat_7|centos_7).!(redhat_6|centos_6).!epel_release_ok:: "yum install --assumeyes https://dl.fedoraproject.org/pub/epel/epel-release-latest-${sys.os_version_major}.noarch.rpm" comment => "rhel-7 installs this with a packages promise. TODO: check a sha for the download URL somehow?", classes => results( "bundle", "epel_release" ), From 23cf08437ed42947b09eac5c88cfe1f1f7ee9bc1 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 21 Apr 2026 15:27:52 -0500 Subject: [PATCH 2/2] fix: ci/cfengine-build-host-setup.cf needed adjustment for suse user management Ticket: ENT-13763 Changelog: none --- ci/cfengine-build-host-setup.cf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/cfengine-build-host-setup.cf b/ci/cfengine-build-host-setup.cf index 5ce9d42ad..4f100eb48 100644 --- a/ci/cfengine-build-host-setup.cf +++ b/ci/cfengine-build-host-setup.cf @@ -408,11 +408,11 @@ jenkins_builds ALL=NOPASSWD: /usr/bin/podman !have_sys_group.(suse|sles|opensuse):: "groupadd -g 3 sys" contain => in_shell; !have_daemon_user.(suse|sles|opensuse):: - "useradd -u 1 daemon" contain => in_shell; + "useradd -u 1 daemon -g daemon" contain => in_shell; !have_bin_user.(suse|sles|opensuse):: - "useradd -u 2 bin" contain => in_shell; + "useradd -u 2 bin -g bin" contain => in_shell; !have_sys_user.(suse|sles|opensuse):: - "useradd -u 3 sys" contain => in_shell; + "useradd -u 3 sys -g sys" contain => in_shell; linux:: "sshd -T 2>/dev/null | grep -qiE '^PermitRootLogin no'"