From 30974c72ed92c756258a3fade6134611ccb4f47d Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Wed, 26 Sep 2018 14:32:07 -0700
Subject: [PATCH] test/common: change branch of nvme-cli

Update the branch to point at our code rebased on the most recent
mainline release of nvme-cli. This branch includes fixes for
compatibility with gcc 8.

Change-Id: Ie1bdb046d1e24e832bda585dd9841619451ec5f5
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/426985
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
---
 test/common/config/vm_setup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh
index eeff9a37a..07af1d28c 100755
--- a/test/common/config/vm_setup.sh
+++ b/test/common/config/vm_setup.sh
@@ -226,8 +226,9 @@ function install_vpp()
 function install_nvmecli()
 {
     if echo $CONF | grep -q nvmecli; then
+        SPDK_NVME_CLI_BRANCH=spdk-1.6
         if [ ! -d nvme-cli ]; then
-            git clone "${GIT_REPO_SPDK_NVME_CLI}"
+            git clone "${GIT_REPO_SPDK_NVME_CLI}" -b "$SPDK_NVME_CLI_BRANCH"
         else
             echo "nvme-cli already checked out. Skipping"
         fi