Commit a15eef8b authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

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: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2671


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 6f5b3911

test/common/config/vm_setup.sh

+5 −1
Original line number Diff line number Diff line
@@ -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