Skip to content

Added RedHat 10 and Debian 13 to platforms to skip for packages tests #3074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 17, 2025
Merged

Added RedHat 10 and Debian 13 to platforms to skip for packages tests #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec9b55a
Added RedHat 10 and Debian 13 to platforms to skip for packages tests
craigcomstock Nov 12, 2025
7bb5dec
Added RedHat 10 and Debian 13 to self upgrade policy
craigcomstock Nov 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion standalone_self_upgrade.cf.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,12 +559,18 @@ bundle common cfengine_package_names
"pkg[oracle_8_x86_64]" string => "$(pkg[redhat_8_x86_64])";
"pkg[rocky_8_x86_64]" string => "$(pkg[redhat_8_x86_64])";

# Redhat/Centos/Oracle/Rocky 8 use the same package
# Redhat/Centos/Oracle/Rocky 9 use the same package
"pkg[redhat_9_x86_64]" string => "$(pkg_name)-$(pkg_version)-$(pkg_release).el9.x86_64.rpm";
"pkg[centos_9_x86_64]" string => "$(pkg[redhat_9_x86_64])";
"pkg[oracle_9_x86_64]" string => "$(pkg[redhat_9_x86_64])";
"pkg[rocky_9_x86_64]" string => "$(pkg[redhat_9_x86_64])";

# Redhat/Centos/Oracle/Rocky 10 use the same package
"pkg[redhat_10_x86_64]" string => "$(pkg_name)-$(pkg_version)-$(pkg_release).el10.x86_64.rpm";
"pkg[centos_10_x86_64]" string => "$(pkg[redhat_10_x86_64])";
"pkg[oracle_10_x86_64]" string => "$(pkg[redhat_10_x86_64])";
"pkg[rocky_10_x86_64]" string => "$(pkg[redhat_10_x86_64])";


# 64bit Debian

Expand All @@ -574,6 +580,7 @@ bundle common cfengine_package_names
"pkg[debian_10_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian10_amd64.deb";
"pkg[debian_11_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian11_amd64.deb";
"pkg[debian_12_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian12_amd64.deb";
"pkg[debian_13_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian13_amd64.deb";

# 64bit Ubuntu
"pkg[ubuntu_14_x86_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).ubuntu14_amd64.deb";
Expand All @@ -590,6 +597,7 @@ bundle common cfengine_package_names
# aarch64 Debian
"pkg[debian_11_arm_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian11_arm64.deb";
"pkg[debian_12_arm_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian12_arm64.deb";
"pkg[debian_13_arm_64]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian13_arm64.deb";

# 32bit DEBs
"pkg[$(cfengine_master_software_content._deb_dists)_$(cfengine_master_software_content._32bit_arches)]" string => "$(pkg_name)_$(pkg_version)-$(pkg_release).debian7_i386.deb";
Expand Down Expand Up @@ -668,6 +676,12 @@ bundle agent cfengine_master_software_content
"dir[oracle_9_x86_64]" string => "$(dir[redhat_9_x86_64])";
"dir[rocky_9_x86_64]" string => "$(dir[redhat_9_x86_64])";

# Redhat/Centos/Oracle/Rocky 10 use the same package
"dir[redhat_10_x86_64]" string => "agent_rhel10_x86_64";
"dir[centos_10_x86_64]" string => "$(dir[redhat_10_x86_64])";
"dir[oracle_10_x86_64]" string => "$(dir[redhat_10_x86_64])";
"dir[rocky_10_x86_64]" string => "$(dir[redhat_10_x86_64])";

# Debian
"dir[debian_7_x86_64]" string => "agent_deb_x86_64";
"dir[debian_8_x86_64]" string => "agent_debian8_x86_64";
Expand All @@ -676,7 +690,9 @@ bundle agent cfengine_master_software_content
"dir[debian_11_x86_64]" string => "agent_debian11_x86_64";
"dir[debian_11_arm_64]" string => "agent_debian11_arm_64";
"dir[debian_12_x86_64]" string => "agent_debian12_x86_64";
"dir[debian_13_x86_64]" string => "agent_debian13_x86_64";
"dir[debian_12_arm_64]" string => "agent_debian12_arm_64";
"dir[debian_13_arm_64]" string => "agent_debian13_arm_64";

# Ubuntu
"dir[ubuntu_14_x86_64]" string => "agent_ubuntu14_x86_64";
Expand Down
7 changes: 1 addition & 6 deletions tests/acceptance/17_packages/01_init/unsafe/timed/001-prepare-repositories.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,13 @@ body common control
"../../../../../../$(sys.local_libdir)/files.cf",
"../../../../../../$(sys.local_libdir)/commands.cf",
"../../../packages-info.cf.sub",
"../../../meta_skip.cf.sub",
};
bundlesequence => { default("$(this.promise_filename)") };
}

bundle agent test
{
meta:
"test_skip_needs_work" string => "!redhat.!debian",
meta => { "redmine5866" };
# RedHat 4 RPM has a bug which corrupts the RPM DB during our tests, so it is untestable.
"test_skip_unsupported" string => "redhat_4|centos_4";

vars:
"bundles" slist => { "repositories",
"signing_keys",
Expand Down
3 changes: 2 additions & 1 deletion tests/acceptance/17_packages/10_new/unsafe/the_great_package_test.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ bundle agent init
# packages where earlier releases did not, so fails many tests.
# RHEL 8 has broken DNF (upgrading a 32bit package also installs a 64bit
# package)

"test_soft_fail" string => "rhel_8|rhel_9",
meta => {"CFE-rhbz", "CFE-4096"};
meta => {"CFE-rhbz", "CFE-4096", "ENT-13499" };

# For setting up the cfengine-selected-python symlink we want to
# target $(sys.bindir) as that will be in the test WORKDIR.
Expand Down
3 changes: 2 additions & 1 deletion tests/acceptance/17_packages/10_new/unsafe/the_great_package_test_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,9 @@ def header(test_count):
# packages where earlier releases did not, so fails many tests.
# RHEL 8 has broken DNF (upgrading a 32bit package also installs a 64bit
# package)

"test_soft_fail" string => "rhel_8|rhel_9",
meta => {"CFE-rhbz", "CFE-4096"};
meta => {"CFE-rhbz", "CFE-4096", "ENT-13499" };

# For setting up the cfengine-selected-python symlink we want to
# target $(sys.bindir) as that will be in the test WORKDIR.
Expand Down
10 changes: 1 addition & 9 deletions tests/acceptance/17_packages/11_old/unsafe/package-inventory.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,13 @@ body common control
"../../../../../$(sys.local_libdir)/packages.cf",
"../../../../../inventory/any.cf",
"../../packages-info.cf.sub",
"../../meta_skip.cf.sub",
};
bundlesequence => { default($(this.promise_files)) };
}

bundle agent init
{
meta:
# need packages for platforms other than redhat and debian on x86_64 architecture
# see tests/acceptance/17_packages/meta_skip.cf.sub
"test_skip_needs_work" string => "(!redhat.!debian)|(!x86_64)",
meta => { "CFE-3992" };
# RedHat 4 RPM has a bug which corrupts the RPM DB during our tests, so it is untestable.
# And available patches is an Enterprise feature.
"test_skip_unsupported" string => "redhat_4|centos_4|!enterprise";

methods:
"any" usebundle => clear_packages("dummy");
"any" usebundle => install_package("$(p.name[1])", "$(p.version[1])", "$(p.arch)", "dummy");
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/17_packages/meta_skip.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
bundle common 17_packages_meta
{
meta:
"test_skip_needs_work" string => "(!redhat.!debian)|(!x86_64)",
comment => "Need to create test packages for platforms other than x86 redhat and debian based distributions.",
meta => { "CFE-3993", "CFE-3992"};
"test_skip_needs_work" string => "(!redhat.!debian)|(!x86_64)|(debian_13|redhat_10)",
comment => "Need to create test packages for platforms other than x86 redhat and debian based distributions. Also, debian-13 deprecates apt-key and requires a newer pubkey algorithm.",
meta => { "CFE-3993", "CFE-3992", "ENT-13499" };

"test_skip_unsupported" string => "redhat_4|centos_4|debian_4|debian_etch",
comment => "RedHat 4 RPM has a bug which corrupts the RPM DB during our tests, so it is untestable.",
Expand Down