From 556768c85c611272b6a3379fbf0f85c2b92bfe4a Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Thu, 12 Aug 2021 10:44:48 -0400 Subject: [PATCH] workunits/rbd: remove lsb_release The lsb_release utility brings in a lot of other dependencies. Remove it from the RBD workunit script. Signed-off-by: Ken Dreyer (cherry picked from commit 65f4d6eb3664a4cc6120031679b8368cbc02a4a5) --- qa/workunits/rbd/qemu-iotests.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qa/workunits/rbd/qemu-iotests.sh b/qa/workunits/rbd/qemu-iotests.sh index ca1617908adf4..267b69165e5d2 100755 --- a/qa/workunits/rbd/qemu-iotests.sh +++ b/qa/workunits/rbd/qemu-iotests.sh @@ -9,10 +9,12 @@ testlist='001 002 003 004 005 008 009 010 011 021 025 032 033' git clone https://github.com/qemu/qemu.git cd qemu -if lsb_release -da 2>&1 | grep -iqE '(bionic|focal)'; then + + +if grep -iqE '(bionic|focal)' /etc/os-release; then # Bionic requires a matching test harness git checkout v2.11.0 -elif lsb_release -da 2>&1 | grep -iqE '(xenial|linux release 8|stream release 8)'; then +elif grep -iqE '(xenial|platform:el8)' /etc/os-release; then # Xenial requires a recent test harness git checkout v2.3.0 else -- 2.39.5