Merge branch 'ten' into 'master'

Adapt tests for EL10

See merge request !7

runtests.sh

@@ -37,7 +37,7 @@ set -u
 # Searching for tests to disable
 if [ -e skipped-tests.list ] ;then
   t_Log "QA Harness : searching for tests to disable with valid reason"
-  egrep ^${centos_ver} skipped-tests.list | while read line;
+  grep -E ^${centos_ver} skipped-tests.list | while read line;
     do test=$(echo $line|cut -f 2 -d '|')
     t_Log "Disabling QA harness test ${test}"
     chmod -x ${test}
@@ -59,7 +59,7 @@ fi
 # and, we're done.
 if [ -e skipped-tests.list ] ;then
   t_Log "QA Harness : Searching for disabled tests (skipped-tests.list)"
-  egrep ^${centos_ver} skipped-tests.list | while read line;
+  grep -E ^${centos_ver} skipped-tests.list | while read line;
     do test=$(echo $line|cut -f 2 -d '|')
     reason=$(echo $line|cut -f 3 -d '|')
     t_Log " =WARNING= : Disabled test : ${test} (${reason})"

skipped-tests.list

@@ -8,13 +8,16 @@
 7|tests/0_common/00_centos_repos.sh|We want to keep CERN repos enabled
 8|tests/0_common/00_centos_repos.sh|We want to keep CERN repos enabled
 9|tests/0_common/00_centos_repos.sh|We want to keep CERN repos enabled
+10|tests/0_common/00_centos_repos.sh|We want to keep CERN repos enabled
 7|tests/0_common/30_dns_works.sh|We spawn VM without waiting for DNS register
 8|tests/0_common/30_dns_works.sh|We spawn VM without waiting for DNS register
 9|tests/0_common/30_dns_works.sh|We spawn VM without waiting for DNS register
+10|tests/0_common/30_dns_works.sh|We spawn VM without waiting for DNS register
 7|tests/0_common/20_upgrade_all.sh|Avoid too much noise on CI logs
 8|tests/0_common/20_upgrade_all.sh|Avoid too much noise on CI logs
 9|tests/0_common/20_upgrade_all.sh|Avoid too much noise on CI logs
 7|tests/cern_openafs/*|We run this test on https://gitlab.cern.ch/linuxsupport/rpms/openafs/ for kmod kernel matching
 8|tests/cern_openafs/*|We run this test on https://gitlab.cern.ch/linuxsupport/rpms/openafs/ for kmod kernel matching
 9|tests/cern_openafs/*|We run this test on https://gitlab.cern.ch/linuxsupport/rpms/openafs/ for kmod kernel matching
+10|tests/cern_openafs/*|We run this test on https://gitlab.cern.ch/linuxsupport/rpms/openafs/ for kmod kernel matching
 7|tests/cern_partitioning/6_dracut.sh|No cern-dracut-conf for CC7

tests/cern_partitioning/5_grub.sh

@@ -34,11 +34,18 @@ t_Log "Looking for net.ifnames=0 in /proc/cmdline"
 grep -e 'net.ifnames=0' /proc/cmdline
 t_CheckExitStatus $?
 
-if [ "$centos_ver" -ge 8 ] ; then
+if [ "$centos_ver" -lt 10 ] ; then
   t_Log "Looking for root UUID in /etc/default/grub"
   grep -e 'GRUB_CMDLINE_LINUX=".*root=UUID=.*' /etc/default/grub
   t_CheckExitStatus $?
   t_Log "Looking for root UUID in /proc/cmdline"
   grep -e 'root=UUID=' /proc/cmdline
   t_CheckExitStatus $?
+else
+  t_Log "Looking for root LABEL in /etc/default/grub"
+  grep -e 'GRUB_CMDLINE_LINUX=".*root=LABEL=ROOT' /etc/default/grub
+  t_CheckExitStatus $?
+  t_Log "Looking for root LABEL in /proc/cmdline"
+  grep -e 'root=LABEL=ROOT' /proc/cmdline
+  t_CheckExitStatus $?
 fi

utils/package-install-list.sh

@@ -3,7 +3,7 @@
 # author: Christoph Galuschka <christoph.galuschka@chello.at>
 # This script will create a file with all packages which get installed by the tests
 
-grep t_InstallPackage ../*/*/* | grep -v export | grep -v functions | egrep -v '.*\$.*' |\
+grep t_InstallPackage ../*/*/* | grep -v export | grep -v functions | grep -E -v '.*\$.*' |\
 cut -d ':' -f 2 | sed 's/^ *//g' | tr -s ' ' | sed 's/t_InstallPackage/yum\ install\ \-y\ \-d0/g' > /var/tmp/t_functional_packagelist
 
 # running the resulting file with '/bin/bash /var/tmp/t_functional_packagelist' will install all packages required by the current tests.