From ba7fd26ca55f009e4719e09cd5e4d0c72f0d8022 Mon Sep 17 00:00:00 2001
From: Karol Latecki <karol.latecki@intel.com>
Date: Wed, 9 Feb 2022 20:11:24 +0100
Subject: [PATCH] pkgdep/git: don't skip nvme-cli installation

Don't skip nvme-cli installation in case previous
installation is detected. This avoids the need to
manually remove previous version installation and
makes it less likely to overlook that nvme-cli was
not upgraded.

Also updating an out-of-date comment in this
function.

Change-Id: I8c6a457ea5ab2eb2f7d48de4721af82d8de7733e
Signed-off-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11480
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
---
 test/common/config/pkgdep/git | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git
index 208bf4fd9..f4bb40db2 100644
--- a/test/common/config/pkgdep/git
+++ b/test/common/config/pkgdep/git
@@ -302,17 +302,16 @@ function install_qemu() {
 }
 
 function install_nvmecli() {
-	if [ ! -d "/usr/local/src/nvme-cli" ]; then
-		# 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
-		if [[ ! -d $GIT_REPOS/nvme-cli-cuse ]]; then
-			git clone "https://github.com/linux-nvme/nvme-cli.git" "$GIT_REPOS/nvme-cli-cuse"
-		fi
-		git -C "$GIT_REPOS/nvme-cli-cuse" checkout v1.16
-		make -C "$GIT_REPOS/nvme-cli-cuse" CPPFLAGS="-Wno-error=maybe-uninitialized"
-		sudo mv "$GIT_REPOS/nvme-cli-cuse" /usr/local/src/nvme-cli
+	# nvme-cli >1.11.1 should be used.
+	if [[ ! -d $GIT_REPOS/nvme-cli-cuse ]]; then
+		git clone "https://github.com/linux-nvme/nvme-cli.git" "$GIT_REPOS/nvme-cli-cuse"
 	fi
+	git -C "$GIT_REPOS/nvme-cli-cuse" checkout v1.16
+	make -C "$GIT_REPOS/nvme-cli-cuse" CPPFLAGS="-Wno-error=maybe-uninitialized"
+	if [ -d "/usr/local/src/nvme-cli" ]; then
+		sudo rm -rf /usr/local/src/nvme-cli
+	fi
+	sudo mv "$GIT_REPOS/nvme-cli-cuse" /usr/local/src/nvme-cli
 }
 
 function install_libiscsi() {