Whamcloud - gitweb
LU-17198 tests: running_in_vm to recognize qemu 04/52704/4
authorAlex Zhuravlev <bzzz@whamcloud.com>
Sun, 15 Oct 2023 18:58:07 +0000 (21:58 +0300)
committerOleg Drokin <green@whamcloud.com>
Fri, 3 Nov 2023 04:06:58 +0000 (04:06 +0000)
qemu is reported in dmidecode's system-manufacturer field,
not in system-product-name

Test-Parameters: trivial
Signed-off-by: Alex Zhuravlev <bzzz@whamcloud.com>
Change-Id: Id7e01ae2825835080d29ebec1750e53b87f5cf04
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52704
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
lustre/tests/test-framework.sh

index 958d5d7..fe752bf 100755 (executable)
@@ -1454,7 +1454,15 @@ running_in_vm() {
 
        case $virt in
                VMware|KVM|VirtualBox|Parallels|Bochs)
-                       echo $virt | tr '[A-Z]' '[a-z]' ;;
+                       echo $virt | tr '[A-Z]' '[a-z]' && return;;
+
+               *) ;;
+       esac
+
+       virt=$(dmidecode -s system-manufacturer | awk '{print $1}')
+       case $virt in
+               QEMU)
+                       echo $virt | tr '[A-Z]' '[a-z]' && return;;
                *) ;;
        esac
 }