diff --git a/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test.cf b/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test.cf index d89b35bfe2..dbcd06465a 100644 --- a/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test.cf +++ b/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test.cf @@ -35,8 +35,10 @@ 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) + # Limited to x86_64: other architectures are skipped (see meta_skip.cf.sub) + # and a skipped test must not also be marked as soft fail. - "test_soft_fail" string => "rhel_8|rhel_9", + "test_soft_fail" string => "(rhel_8|rhel_9).x86_64", meta => {"CFE-rhbz", "CFE-4096", "ENT-13499" }; # For setting up the cfengine-selected-python symlink we want to diff --git a/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test_generator.py b/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test_generator.py index cc144d8a49..9187f24413 100755 --- a/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test_generator.py +++ b/tests/acceptance/17_packages/10_new/unsafe/the_great_package_test_generator.py @@ -121,8 +121,10 @@ 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) + # Limited to x86_64: other architectures are skipped (see meta_skip.cf.sub) + # and a skipped test must not also be marked as soft fail. - "test_soft_fail" string => "rhel_8|rhel_9", + "test_soft_fail" string => "(rhel_8|rhel_9).x86_64", meta => {"CFE-rhbz", "CFE-4096", "ENT-13499" }; # For setting up the cfengine-selected-python symlink we want to