From 7cbb97100e89bf7049f03d969f2ca0a683e41a84 Mon Sep 17 00:00:00 2001 From: Derek Su Date: Thu, 8 Jun 2023 10:36:05 +0800 Subject: [PATCH] spdk: nvme-cli should be between 1.12 and 1.16 Signed-off-by: Derek Su --- scripts/environment_check.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/environment_check.sh b/scripts/environment_check.sh index 1e7baa0..e38d650 100755 --- a/scripts/environment_check.sh +++ b/scripts/environment_check.sh @@ -1,6 +1,7 @@ #!/bin/bash -NVME_CLI_VERSION="1.12" +NVME_CLI_MIN_VERSION="1.12" +NVME_CLI_MAX_VERSION="1.16" ###################################################### # Log @@ -420,10 +421,11 @@ function check_nvme_cli() { fi local actual_version=$(echo "$value" | grep -o "[0-9]\+\.[0-9]\+") - if [[ "$(printf '%s\n' "${NVME_CLI_VERSION}" "$actual_version" | sort -V | tail -n1)" == "$actual_version" ]]; then + if [[ "$(printf '%s\n' "${NVME_CLI_MIN_VERSION}" "$actual_version" | sort -V | tail -n1)" == "$actual_version" && \ + "$(printf '%s\n' "$actual_version" "${NVME_CLI_MAX_VERSION}" | sort -V | head -n1)" == "$actual_version" ]]; then return 0 fi - error "nvme-cli version should be at least ${NVME_CLI_VERSION} on node ${node}. Actual: ${actual_version}" + error "nvme-cli version should be between ${NVME_CLI_MIN_VERSION} and ${NVME_CLI_MAX_VERSION} on node ${node}. Actual: ${actual_version}" return 1 }