From a15eef8b03d2d15d6782abf1f5423633e66a6e46 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Thu, 28 May 2020 14:51:14 +0200 Subject: [PATCH] vm_setup: Check for btrfs-progs on apt-get based systems Currently, Ubuntu 20.04 exposes btrfs-tools under different name, btrfs-progs. Be nice and fallback to that package name if btrfs-tools installation fails. Change-Id: I78d51b081069b252c59b13d2347cdd077938131a Signed-off-by: Michal Berger Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2671 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- test/common/config/vm_setup.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index 570bf52e6..b4ec608b8 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -620,6 +620,11 @@ if $INSTALL; then sudo apt-get install -y targetcli fi + # On Ubuntu 20.04 (focal) btrfs-tools are available under different name - btrfs-progs + if ! sudo apt-get install -y btrfs-tools; then + sudo apt-get install -y btrfs-progs + fi + sudo apt-get install -y \ valgrind \ jq \ @@ -648,7 +653,6 @@ if $INSTALL; then sshfs \ sshpass \ python3-pandas \ - btrfs-tools \ bc \ smartmontools \ wget