From 519f54f42f194ea0159bea1950fc951e2e49a81d Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 13 Nov 2025 09:51:17 -0600 Subject: [PATCH 01/11] Added skip for run_lastseen_threaded_load.sh test on HP/UX Ticket: ENT-7541 Changelog: none --- tests/load/run_lastseen_threaded_load.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/load/run_lastseen_threaded_load.sh b/tests/load/run_lastseen_threaded_load.sh index aebcf21a91..64293cbb9a 100755 --- a/tests/load/run_lastseen_threaded_load.sh +++ b/tests/load/run_lastseen_threaded_load.sh @@ -1,10 +1,11 @@ #!/bin/sh -if [ "x$label" = "xPACKAGES_x86_64_solaris_10" ] ; -then - echo "Skipping lastseen_threaded_load on $label" +for skip_label in PACKAGES_x86_64_solaris_10 PACKAGES_ia64_hpux_11.23; do + if [ "$label" = "$skip_label" ]; then + echo "Skipping $0 on label $skip_label" exit 0; -fi + fi +done echo "Starting run_lastseen_threaded_load.sh test" From fe2d1fdb46242b26e01fa5a3d928b5f52e3dfaee Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 13 Nov 2025 09:59:16 -0600 Subject: [PATCH 02/11] Fixed ci/dependencies.sh for use on a subscribed rhel host Ticket: none Changelog: none --- ci/dependencies.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/dependencies.sh b/ci/dependencies.sh index 297ebe52c1..e8b60d99a8 100755 --- a/ci/dependencies.sh +++ b/ci/dependencies.sh @@ -22,7 +22,8 @@ if [ -f /etc/os-release ]; then $GAINROOT subscription-manager config --rhsm.manage_repos=1 $GAINROOT subscription-manager repos --enable codeready-builder-for-rhel-"$VERSION_MAJOR"-"$(uname -m)"-rpms $GAINROOT dnf install --assumeyes https://dl.fedoraproject.org/pub/epel/epel-release-latest-"$VERSION_MAJOR".noarch.rpm - $GAINROOT dnf install --assumeyes flex-devel lmdb-devel librsync-devel fakeroot # only available via subscription with codeready-builder installed + $GAINROOT dnf install --assumeyes autoconf automake + $GAINROOT dnf install --assumeyes gcc gdb make git libtool autoconf automake byacc flex openssl-devel pcre2-devel lmdb-devel pam-devel flex-devel libyaml-devel fakeroot libxml2-devel librsync-devel # flex-devel, libyaml-devel and fakeroot are also only available easily from codeready-builder but are not critical to building CFEngine usable enough to configure a build host. # fakeroot is only needed for running tests but can be worked around by using GAINROOT=env with tests/acceptance/testall script else From f0f64450c680e5977990b09f2cf01ba5278707cf Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 13 Nov 2025 10:48:12 -0600 Subject: [PATCH 03/11] Added RedHat 10 soft fail for findlocalusers tests Username is "Super User" and not the expected "root" Ticket: ENT-13016 Changelog: none --- tests/acceptance/01_vars/02_functions/findlocalusers.cf | 3 ++- .../01_vars/02_functions/unsafe/findlocalusers_unsafe.cf | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/01_vars/02_functions/findlocalusers.cf b/tests/acceptance/01_vars/02_functions/findlocalusers.cf index d08189e3c5..2cf7d65f19 100644 --- a/tests/acceptance/01_vars/02_functions/findlocalusers.cf +++ b/tests/acceptance/01_vars/02_functions/findlocalusers.cf @@ -28,7 +28,8 @@ bundle agent init bundle agent test { meta: - "test_soft_fail" string => "windows|aix|solaris", + "test_soft_fail" string => "windows|aix|solaris|redhat_10", + comment => "redhat_10 user name is 'Super User' not 'root'", meta => { "CFE-2318" }; vars: diff --git a/tests/acceptance/01_vars/02_functions/unsafe/findlocalusers_unsafe.cf b/tests/acceptance/01_vars/02_functions/unsafe/findlocalusers_unsafe.cf index d735be9a8c..90bb83e09c 100644 --- a/tests/acceptance/01_vars/02_functions/unsafe/findlocalusers_unsafe.cf +++ b/tests/acceptance/01_vars/02_functions/unsafe/findlocalusers_unsafe.cf @@ -51,7 +51,8 @@ bundle agent init bundle agent test { meta: - "test_soft_fail" string => "windows|aix|solaris", + "test_soft_fail" string => "windows|aix|solaris|redhat_10", + comment => "RedHat 10 root user is named 'Super User' not 'root'", meta => { "CFE-2318" }; vars: From 41ec5d2bbb1ab8e75ef1333cb3b2050289af302c Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 13 Nov 2025 12:21:24 -0600 Subject: [PATCH 04/11] Added suse_15 skip needs work to getgroups.cf test The test expecs root, bin, daemon as first three groups. On SuSE 15 this is not the case. They have root, shadow, trusted. Ticket: ENT-13504 Changelog: none --- tests/acceptance/01_vars/02_functions/getgroups.cf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/acceptance/01_vars/02_functions/getgroups.cf b/tests/acceptance/01_vars/02_functions/getgroups.cf index c22bdc8c9f..356473710d 100644 --- a/tests/acceptance/01_vars/02_functions/getgroups.cf +++ b/tests/acceptance/01_vars/02_functions/getgroups.cf @@ -16,6 +16,11 @@ bundle agent check meta: "description" -> { "ENT-12722" } string => "Test whether the entries of getroups() are like the ones inside /etc/group"; + "test_skip_needs_work" + string => "suse_15|sles_15", + comment => "expects first three groups are root, bin, daemon but on suse_15 they are root, shadow, trusted.", + meta => { "ENT-13504" }; + "test_skip_unsupported" string => "windows"; vars: From f50d746cf139db147c346517e23e48f25679a7f2 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 13 Nov 2025 12:27:55 -0600 Subject: [PATCH 05/11] Added support for suse platform in ci/dependencies.sh Ticket: none Changelog: none --- ci/dependencies.sh | 56 +++++++++++++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/ci/dependencies.sh b/ci/dependencies.sh index e8b60d99a8..f7b842ab06 100755 --- a/ci/dependencies.sh +++ b/ci/dependencies.sh @@ -11,11 +11,44 @@ if [ "$(id -u)" != "0" ]; then fi fi +build_lmdb() { +if [ -f /usr/include/lmdb.h ]; then + echo lmdb libraries already installed, no-op. + return +fi + tmpdir="$(mktemp -d)" +echo building lmdb in "$tmpdir" + ( + cd "$tmpdir" + git clone --recursive --depth 1 https://github.com/LMDB/lmdb + cd lmdb/libraries/liblmdb + make + $GAINROOT make install prefix=/usr + ) +} + +build_librsync() { +tmpdir="$(mktemp -d)" +echo building librsync in "$tmpdir" +( +cd "$tmpdir" + git clone --recursive --depth 1 https://github.com/librsync/librsync + cd librsync + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . + make + $GAINROOT make install +) +} + # limited support here, focused on rhel-like on aarch64 which has no previous CFEngine version to leverage: ENT-13016 if [ -f /etc/os-release ]; then source /etc/os-release VERSION_MAJOR=${VERSION_ID%.*} - if [ "$ID" = "rhel" ] || [[ "$ID_LIKE" =~ "rhel" ]]; then + if [[ "$ID_LIKE" =~ "suse" ]]; then + $GAINROOT zypper -qn install gdb gcc make lmdb autoconf automake libtool git python3 pcre2-devel libopenssl-devel pam-devel cmake flex byacc + build_lmdb + build_librsync + elif [ "$ID" = "rhel" ] || [[ "$ID_LIKE" =~ "rhel" ]]; then if [ "$VERSION_MAJOR" -ge "10" ]; then # note that having a redhat subscription makes things easier: lmdb-devel and librsync-devel are available from codeready-builder repo if subscription-manager status; then @@ -30,23 +63,10 @@ if [ -f /etc/os-release ]; then # here we assume no subscription and so must build those two dependencies from source :) $GAINROOT yum groups install -y 'Development Tools' $GAINROOT yum update --assumeyes - $GAINROOT yum install -y gcc gdb make git libtool autoconf automake byacc flex openssl-devel pcre2-devel pam-devel libxml2-devel - tmpdir="$(mktemp -d)" - echo "Building lmdb and librsync in $tmpdir" - ( - cd "$tmpdir" - git clone --recursive --depth 1 https://github.com/LMDB/lmdb - cd lmdb/libraries/liblmdb - make - $GAINROOT make install prefix=/usr - cd - - $GAINROOT dnf install -y cmake - git clone --recursive --depth 1 https://github.com/librsync/librsync - cd librsync - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . - make - $GAINROOT make install - ) + # cmake is for building librsync + $GAINROOT yum install -y gcc gdb make git libtool autoconf automake byacc flex openssl-devel pcre2-devel pam-devel libxml2-devel cmake + build_lmdb + build_librsync fi else echo "Unsupported version of redhat for $0" From 0ecfdb1aa78e6353a9989f8eb1320c9b4f83bfa9 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 13 Nov 2025 12:28:54 -0600 Subject: [PATCH 06/11] Used shfmt to format ci/*.sh scripts Ticket: none Changelog: none --- ci/configure.sh | 2 +- ci/dependencies.sh | 127 ++++++++++++++++++++++----------------------- ci/install.sh | 12 ++--- 3 files changed, 70 insertions(+), 71 deletions(-) diff --git a/ci/configure.sh b/ci/configure.sh index 816fff6133..91ab30895c 100755 --- a/ci/configure.sh +++ b/ci/configure.sh @@ -7,7 +7,7 @@ cd "$thisdir"/.. OPTS="--enable-debug" if [ -n "$TERMUX_VERSION" ]; then - OPTS="$OPTS --without-pam" + OPTS="$OPTS --without-pam" fi ./autogen.sh $OPTS diff --git a/ci/dependencies.sh b/ci/dependencies.sh index f7b842ab06..f916abe683 100755 --- a/ci/dependencies.sh +++ b/ci/dependencies.sh @@ -4,84 +4,83 @@ set -ex GAINROOT="" if [ "$(id -u)" != "0" ]; then - GAINROOT="sudo" - if ! command -v sudo >/dev/null; then - echo "Sorry, either run $0 as root or install sudo." - exit 1 - fi + GAINROOT="sudo" + if ! command -v sudo >/dev/null; then + echo "Sorry, either run $0 as root or install sudo." + exit 1 + fi fi build_lmdb() { -if [ -f /usr/include/lmdb.h ]; then - echo lmdb libraries already installed, no-op. - return -fi - tmpdir="$(mktemp -d)" -echo building lmdb in "$tmpdir" - ( - cd "$tmpdir" - git clone --recursive --depth 1 https://github.com/LMDB/lmdb - cd lmdb/libraries/liblmdb - make - $GAINROOT make install prefix=/usr - ) + if [ -f /usr/include/lmdb.h ]; then + echo lmdb libraries already installed, no-op. + return + fi + tmpdir="$(mktemp -d)" + echo building lmdb in "$tmpdir" + ( + cd "$tmpdir" + git clone --recursive --depth 1 https://github.com/LMDB/lmdb + cd lmdb/libraries/liblmdb + make + $GAINROOT make install prefix=/usr + ) } build_librsync() { -tmpdir="$(mktemp -d)" -echo building librsync in "$tmpdir" -( -cd "$tmpdir" - git clone --recursive --depth 1 https://github.com/librsync/librsync - cd librsync - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . - make - $GAINROOT make install -) + tmpdir="$(mktemp -d)" + echo building librsync in "$tmpdir" + ( + cd "$tmpdir" + git clone --recursive --depth 1 https://github.com/librsync/librsync + cd librsync + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . + make + $GAINROOT make install + ) } # limited support here, focused on rhel-like on aarch64 which has no previous CFEngine version to leverage: ENT-13016 if [ -f /etc/os-release ]; then - source /etc/os-release - VERSION_MAJOR=${VERSION_ID%.*} - if [[ "$ID_LIKE" =~ "suse" ]]; then - $GAINROOT zypper -qn install gdb gcc make lmdb autoconf automake libtool git python3 pcre2-devel libopenssl-devel pam-devel cmake flex byacc - build_lmdb - build_librsync - elif [ "$ID" = "rhel" ] || [[ "$ID_LIKE" =~ "rhel" ]]; then - if [ "$VERSION_MAJOR" -ge "10" ]; then - # note that having a redhat subscription makes things easier: lmdb-devel and librsync-devel are available from codeready-builder repo - if subscription-manager status; then - $GAINROOT subscription-manager config --rhsm.manage_repos=1 - $GAINROOT subscription-manager repos --enable codeready-builder-for-rhel-"$VERSION_MAJOR"-"$(uname -m)"-rpms - $GAINROOT dnf install --assumeyes https://dl.fedoraproject.org/pub/epel/epel-release-latest-"$VERSION_MAJOR".noarch.rpm - $GAINROOT dnf install --assumeyes autoconf automake - $GAINROOT dnf install --assumeyes gcc gdb make git libtool autoconf automake byacc flex openssl-devel pcre2-devel lmdb-devel pam-devel flex-devel libyaml-devel fakeroot libxml2-devel librsync-devel - # flex-devel, libyaml-devel and fakeroot are also only available easily from codeready-builder but are not critical to building CFEngine usable enough to configure a build host. - # fakeroot is only needed for running tests but can be worked around by using GAINROOT=env with tests/acceptance/testall script - else - # here we assume no subscription and so must build those two dependencies from source :) - $GAINROOT yum groups install -y 'Development Tools' - $GAINROOT yum update --assumeyes - # cmake is for building librsync - $GAINROOT yum install -y gcc gdb make git libtool autoconf automake byacc flex openssl-devel pcre2-devel pam-devel libxml2-devel cmake + source /etc/os-release + VERSION_MAJOR=${VERSION_ID%.*} + if [[ "$ID_LIKE" =~ "suse" ]]; then + $GAINROOT zypper -qn install gdb gcc make lmdb autoconf automake libtool git python3 pcre2-devel libopenssl-devel pam-devel cmake flex byacc build_lmdb build_librsync - fi + elif [ "$ID" = "rhel" ] || [[ "$ID_LIKE" =~ "rhel" ]]; then + if [ "$VERSION_MAJOR" -ge "10" ]; then + # note that having a redhat subscription makes things easier: lmdb-devel and librsync-devel are available from codeready-builder repo + if subscription-manager status; then + $GAINROOT subscription-manager config --rhsm.manage_repos=1 + $GAINROOT subscription-manager repos --enable codeready-builder-for-rhel-"$VERSION_MAJOR"-"$(uname -m)"-rpms + $GAINROOT dnf install --assumeyes https://dl.fedoraproject.org/pub/epel/epel-release-latest-"$VERSION_MAJOR".noarch.rpm + $GAINROOT dnf install --assumeyes autoconf automake + $GAINROOT dnf install --assumeyes gcc gdb make git libtool autoconf automake byacc flex openssl-devel pcre2-devel lmdb-devel pam-devel flex-devel libyaml-devel fakeroot libxml2-devel librsync-devel + # flex-devel, libyaml-devel and fakeroot are also only available easily from codeready-builder but are not critical to building CFEngine usable enough to configure a build host. + # fakeroot is only needed for running tests but can be worked around by using GAINROOT=env with tests/acceptance/testall script + else + # here we assume no subscription and so must build those two dependencies from source :) + $GAINROOT yum groups install -y 'Development Tools' + $GAINROOT yum update --assumeyes + # cmake is for building librsync + $GAINROOT yum install -y gcc gdb make git libtool autoconf automake byacc flex openssl-devel pcre2-devel pam-devel libxml2-devel cmake + build_lmdb + build_librsync + fi + else + echo "Unsupported version of redhat for $0" + exit 1 + fi + elif [ "$ID" = "debian" ] || [[ "$ID_LIKE" =~ "debian" ]]; then + $GAINROOT apt update -y + $GAINROOT apt install -y build-essential git libtool autoconf automake bison flex libssl-dev libpcre2-dev libbison-dev libacl1 libacl1-dev lmdb-utils liblmdb-dev libpam0g-dev libtool libyaml-dev libxml2-dev librsync-dev else - echo "Unsupported version of redhat for $0" - exit 1 + echo "Unsupported distribution based on /etc/os-release." fi - elif [ "$ID" = "debian" ] || [[ "$ID_LIKE" =~ "debian" ]]; then - $GAINROOT apt update -y - $GAINROOT apt install -y build-essential git libtool autoconf automake bison flex libssl-dev libpcre2-dev libbison-dev libacl1 libacl1-dev lmdb-utils liblmdb-dev libpam0g-dev libtool libyaml-dev libxml2-dev librsync-dev - else - echo "Unsupported distribution based on /etc/os-release." - fi elif [ -n "$TERMUX_VERSION" ]; then - pkg install build-essential git autoconf automake bison flex liblmdb openssl pcre2 libacl libyaml + pkg install build-essential git autoconf automake bison flex liblmdb openssl pcre2 libacl libyaml else - echo "Unsupported operating system for $0" - exit 1 + echo "Unsupported operating system for $0" + exit 1 fi - diff --git a/ci/install.sh b/ci/install.sh index bb9ccf96a6..79dbeb14fc 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -8,13 +8,13 @@ thisdir=$(dirname $0) cd "$thisdir"/.. GAINROOT="" if [ ! -n "$TERMUX_VERSION" ]; then - if [ "$(id -u)" != "0" ]; then - if ! command -v sudo >/dev/null; then - echo "Sorry, run $0 as root or install and configure sudo." - exit 1 + if [ "$(id -u)" != "0" ]; then + if ! command -v sudo >/dev/null; then + echo "Sorry, run $0 as root or install and configure sudo." + exit 1 + fi + GAINROOT="sudo" fi - GAINROOT="sudo" - fi fi $GAINROOT make install From f3ea480fc346997148e36c013b4fd7203a019f90 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 13 Nov 2025 14:17:06 -0600 Subject: [PATCH 07/11] Adjusted findlocalgroups soft fail platforms to include solaris which now passes Ticket: none Changelog: none --- tests/acceptance/01_vars/02_functions/findlocalgroups.cf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/01_vars/02_functions/findlocalgroups.cf b/tests/acceptance/01_vars/02_functions/findlocalgroups.cf index c70f69d1e3..2852b516bd 100644 --- a/tests/acceptance/01_vars/02_functions/findlocalgroups.cf +++ b/tests/acceptance/01_vars/02_functions/findlocalgroups.cf @@ -35,7 +35,7 @@ bundle agent test { meta: "test_soft_fail" - string => "!linux|(termux|android)", + string => "(!linux&!solaris)|(termux|android)", meta => { "CFE-2318" }; vars: "glist1" From 81a453e60250271989e8b720ce3de3e763cbbd41 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 13 Nov 2025 14:29:04 -0600 Subject: [PATCH 08/11] Marked select_without_result test as soft fail on solaris Ticket: ENT-13505 Changelog: none --- .../05_processes/01_matching/select_without_result.cf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/05_processes/01_matching/select_without_result.cf b/tests/acceptance/05_processes/01_matching/select_without_result.cf index 501a193f6e..a42389acf3 100644 --- a/tests/acceptance/05_processes/01_matching/select_without_result.cf +++ b/tests/acceptance/05_processes/01_matching/select_without_result.cf @@ -36,8 +36,8 @@ bundle agent test meta: # This test exposes a known issue with processes on the Windows platform. "test_soft_fail" - string => "windows", - meta => {"ENT-12751"}; + string => "windows|solaris", + meta => { "ENT-12751", "ENT-13505" }; "description" -> {"CFE-4511"} string => "process_select body without process_result"; From 93f42e9f33e75836376247a9ea9e6e2a55299e98 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Mon, 10 Nov 2025 09:52:53 -0600 Subject: [PATCH 09/11] Added soft fail marker to copy_from_ciphers_success test on RedHat 10 On RedHat 10 the cipher AES128-GCM-SHA256 is not part of the -ciphersuites TLSv1.3 defaults and so the client with defaults cannot communicate with the server. We need to configure these tests more dynamically based on what ciphers are available in the openssl that is being used. In this case RedHat 10 uses systemssl and happens to be openssl 3.2.2 which apparently breaks this test. Ticket: ENT-13494 Changelog: none (cherry picked from commit 647aae674462fe7c7d3437ad8f1fd7fdda41d024) (cherry picked from commit 5a621299d55c2d48fe98fa39036bcefc48a942ae) --- .../16_cf-serverd/serial/copy_from_ciphers_success.cf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf index 9585f5cbd1..0928558dce 100644 --- a/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf +++ b/tests/acceptance/16_cf-serverd/serial/copy_from_ciphers_success.cf @@ -8,8 +8,8 @@ body common control bundle agent test { meta: - "test_soft_fail" string => "windows", - meta => { "ENT-10401" }; + "test_soft_fail" string => "windows|redhat_10", + meta => { "ENT-10401", "ENT-13494" }; methods: # source file From 93a47deff6efe8d36c2c9245bb09ea707d768d40 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 13 Nov 2025 19:40:58 -0600 Subject: [PATCH 10/11] Improved ci script by using long readable options Ticket: none Changelog: none --- ci/dependencies.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/dependencies.sh b/ci/dependencies.sh index f916abe683..844118dd1c 100755 --- a/ci/dependencies.sh +++ b/ci/dependencies.sh @@ -61,10 +61,10 @@ if [ -f /etc/os-release ]; then # fakeroot is only needed for running tests but can be worked around by using GAINROOT=env with tests/acceptance/testall script else # here we assume no subscription and so must build those two dependencies from source :) - $GAINROOT yum groups install -y 'Development Tools' + $GAINROOT yum groups install --assumeyes 'Development Tools' $GAINROOT yum update --assumeyes # cmake is for building librsync - $GAINROOT yum install -y gcc gdb make git libtool autoconf automake byacc flex openssl-devel pcre2-devel pam-devel libxml2-devel cmake + $GAINROOT yum install --assumeyes gcc gdb make git libtool autoconf automake byacc flex openssl-devel pcre2-devel pam-devel libxml2-devel cmake build_lmdb build_librsync fi @@ -73,8 +73,8 @@ if [ -f /etc/os-release ]; then exit 1 fi elif [ "$ID" = "debian" ] || [[ "$ID_LIKE" =~ "debian" ]]; then - $GAINROOT apt update -y - $GAINROOT apt install -y build-essential git libtool autoconf automake bison flex libssl-dev libpcre2-dev libbison-dev libacl1 libacl1-dev lmdb-utils liblmdb-dev libpam0g-dev libtool libyaml-dev libxml2-dev librsync-dev + $GAINROOT apt update --yes + $GAINROOT apt install --yes build-essential git libtool autoconf automake bison flex libssl-dev libpcre2-dev libbison-dev libacl1 libacl1-dev lmdb-utils liblmdb-dev libpam0g-dev libtool libyaml-dev libxml2-dev librsync-dev else echo "Unsupported distribution based on /etc/os-release." fi From 33d2617f7a0acbbe4f977d7cc3ca7eec36e5d5a0 Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Fri, 14 Nov 2025 14:27:07 +0100 Subject: [PATCH 11/11] Added aix skip needs work to getgroups.cf test The test expecs root, bin, daemon - in that order. However, on aix it is root, daemon, bin. Ticket: ENT-13504 Signed-off-by: Lars Erik Wik --- tests/acceptance/01_vars/02_functions/getgroups.cf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/01_vars/02_functions/getgroups.cf b/tests/acceptance/01_vars/02_functions/getgroups.cf index 356473710d..7163a56d6b 100644 --- a/tests/acceptance/01_vars/02_functions/getgroups.cf +++ b/tests/acceptance/01_vars/02_functions/getgroups.cf @@ -17,8 +17,10 @@ bundle agent check "description" -> { "ENT-12722" } string => "Test whether the entries of getroups() are like the ones inside /etc/group"; "test_skip_needs_work" - string => "suse_15|sles_15", - comment => "expects first three groups are root, bin, daemon but on suse_15 they are root, shadow, trusted.", + string => "suse_15|sles_15|aix", + comment => "expects first three groups are root, bin, daemon. However, on: + - suse_15 they are root, shadow, trusted. + - aix they are root, daemon, bin (i.e. different order).", meta => { "ENT-13504" }; "test_skip_unsupported"