From 8d69fd9139b87fec33ce2460011dcd261c5af456 Mon Sep 17 00:00:00 2001 From: Tomasz Kulasek Date: Wed, 13 May 2020 12:39:55 +0200 Subject: [PATCH] test/vm_setup: install required nvme-cli tool Currently used fork of nvme-cli (nvme-cli v1.8 with our patch) doesn't work well with namespace manage feature (e.g. namespace deletion or working with NSID=0xffffffff). These problems seems to be fixed in later versions of nvme-cli (v1.11.1 for now). Nvme-cli tool must be patched to support namespace devices exposed as character devices. Required modification is already merged with current nvme-cli master in commit: e770466615096a6d41f038a28819b00bc3078e1d and hopefully will be available in the next release of nvme-cli (>1.11.1). Next steps would be: 1) Change the commit hash to a release that includes mentioned patch. 2) Drop the compilation when system repos contain the right release. Change-Id: I07846cba955e580f5a8861ad4c7e50e7f4adccfb Signed-off-by: Tomasz Kulasek Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2417 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Tomasz Zawadzki --- test/common/config/vm_setup.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index d57fa6e2a..be8f9feca 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -331,8 +331,11 @@ function install_nvmecli() { echo "nvme-cli already checked out. Skipping" fi if [ ! -d "/usr/local/src/nvme-cli" ]; then - git clone "https://review.spdk.io/spdk/nvme-cli" "nvme-cli-cuse" - git -C ./nvme-cli-cuse checkout nvme-cuse + # Changes required for SPDK are already merged on top of + # nvme-cli, however not released yet. + # Support for SPDK should be released in nvme-cli >1.11.1 + git clone "https://github.com/linux-nvme/nvme-cli.git" "nvme-cli-cuse" + git -C ./nvme-cli-cuse checkout "e770466615096a6d41f038a28819b00bc3078e1d" make -C ./nvme-cli-cuse sudo mv ./nvme-cli-cuse /usr/local/src/nvme-cli fi