Merge pull request #1567 from KKoukiou/run-bootc-tests-rhel

bootc: enable tests on rhel-10

Author: rvykydal

bootc-basic.sh

@@ -20,7 +20,7 @@
 
 # Ignore unused variable parsed out by tooling scripts as test tags metadata
 # shellcheck disable=SC2034
-TESTTYPE="skip-on-rhel-9 payload bootc rhel58215 gh1574"
+TESTTYPE="skip-on-rhel-9 payload bootc gh1574"
 
 . ${KSTESTDIR}/functions.sh
 
@@ -45,16 +45,29 @@ copy_interesting_files_from_system() {
     # The location of aforementioned files is different in an ostree system
 
     # Find root device - use list-filesystems to find filesystem mounted at /
+
+    # First try btrfs root subvolume
     root_device="$(guestfish ${args} <<< "
         launch
         list-filesystems
         " 2>/dev/null | awk -F'[:/]' '/btrfsvol:.*root/ {print "/" $3 "/" $4}')"
+    path_prefix="/ostree/deploy/test-stateroot"
+
+    if [ -n "${root_device}" ]; then
+        path_prefix="/root$path_prefix"
+    else
+        # Fallback to standard root device on XFS
+        root_device="$(guestfish ${args} <<< "
+            launch
+            list-filesystems
+            " 2>/dev/null | grep root | awk -F: '{print $1}')"
+    fi
 
-    for item in /root/ostree/deploy/test-stateroot/var/roothome/original-ks.cfg \
-                /root/ostree/deploy/test-stateroot/var/roothome/anaconda-ks.cfg \
-                /root/ostree/deploy/test-stateroot/var/roothome/anabot.log \
-                /root/ostree/deploy/test-stateroot/var/log/anaconda/ \
-                /root/ostree/deploy/test-stateroot/var/roothome/RESULT
+    for item in ${path_prefix}/var/roothome/original-ks.cfg \
+                ${path_prefix}/var/roothome/anaconda-ks.cfg \
+                ${path_prefix}/var/roothome/anabot.log \
+                ${path_prefix}/var/log/anaconda/ \
+                ${path_prefix}/var/roothome/RESULT
     do
         guestfish ${args} <<< "
             launch

bootc-luks.sh

@@ -18,7 +18,7 @@
 
 # Ignore unused variable parsed out by tooling scripts as test tags metadata
 # shellcheck disable=SC2034
-TESTTYPE="skip-on-rhel payload bootc luks gh1574"
+TESTTYPE="skip-on-rhel-9 payload bootc luks gh1574"
 
 . ${KSTESTDIR}/functions.sh
 

containers/runner/skip-testtypes

@@ -70,7 +70,6 @@ rhel10_centos10_disabled_array=(
   gh1213      # harddrive-iso-single failing
   gh1536      # groups-and-envs-* failing
   gh1538      # packages-ignorebroken not implemented
-  rhel58215   # bootc-basic waiting for feature backport
 )
 
 rhel10_skip_array=(