Merge pull request #30313 from mrc0mmand/ubuntu-ci

Reduce the number of deny-list files for Ubuntu CI

Author: bluca

test/TEST-25-IMPORT/deny-list-ubuntu-ci

@@ -14,4 +14,9 @@ else
     QEMU_OPTIONS+=" -numa node,nodeid=0"
 fi
 
+if [[ "$(uname -m)" =~ ^(s390x|ppc)$ ]]; then
+    echo "QEMU doesn't support NUMA nodes on $(uname -m), skipping the test"
+    exit 0
+fi
+
 do_test "$@"

test/TEST-30-ONCLOCKCHANGE/deny-list-ubuntu-ci-i386

@@ -17,6 +17,11 @@ if ! command -v btrfs >/dev/null || ! command -v mkfs.btrfs >/dev/null; then
     exit 0
 fi
 
+if ! btrfs filesystem mkswapfile --help >/dev/null; then
+    echo "TEST: $TEST_DESCRIPTION [SKIPPED]: 'btrfs filesystem' doesn't support 'mkswapfile' subcommand" >&2
+    exit 0
+fi
+
 test_append_files() {
     install_btrfs
     image_install sync