]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
workunits/rbd: remove lsb_release
authorKen Dreyer <kdreyer@redhat.com>
Thu, 12 Aug 2021 14:44:48 +0000 (10:44 -0400)
committerKen Dreyer <kdreyer@redhat.com>
Tue, 31 Aug 2021 21:19:18 +0000 (17:19 -0400)
The lsb_release utility brings in a lot of other dependencies. Remove
it from the RBD workunit script.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 65f4d6eb3664a4cc6120031679b8368cbc02a4a5)

 Conflicts:
qa/workunits/rbd/qemu-iotests.sh - trivial fix

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
qa/workunits/rbd/qemu-iotests.sh

index 1f13da9fc09103d76bbddd60d6d730037e959eb7..267b69165e5d2885599860bed512394c8b6c93fc 100755 (executable)
@@ -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)'; then
+elif grep -iqE '(xenial|platform:el8)' /etc/os-release; then
     # Xenial requires a recent test harness
     git checkout v2.3.0
 else