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

Most tests are Debian based.
So keep skipping RedHat and skip Debian 13 due to apt-key being deprecated and our public key type being unsupported.

Ticket: ENT-13164 ENT-13016
Changelog: none

Author: craigcomstock

tests/acceptance/17_packages/01_init/unsafe/timed/001-prepare-repositories.cf

@@ -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",

tests/acceptance/17_packages/10_new/unsafe/the_great_package_test.cf

@@ -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.

tests/acceptance/17_packages/10_new/unsafe/the_great_package_test_generator.py

@@ -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.

tests/acceptance/17_packages/11_old/unsafe/package-inventory.cf

@@ -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");

tests/acceptance/17_packages/meta_skip.cf.sub

@@ -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.",