From ab2a1b7ad65ff8d91ece9d4409e4bff7cb5753e9 Mon Sep 17 00:00:00 2001 From: Prasad Chandrasekaran Date: Fri, 24 Mar 2023 14:32:23 +0530 Subject: [PATCH] Incorporate review comments Signed-off-by: Prasad Chandrasekaran --- scripts/test_images.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/test_images.sh b/scripts/test_images.sh index 7980ef732..e4600c1f1 100755 --- a/scripts/test_images.sh +++ b/scripts/test_images.sh @@ -15,13 +15,8 @@ function startContainer { sleep 5 } -# stop container -trap 'docker stop "${RUN_NAME}"' EXIT - function runVersionCheck { - binary="/usr/local/bin/""$1" - versionString="$2" - Out=$(docker exec "${RUN_NAME}" "${binary}" "${versionString}") + Out=$(docker exec "${RUN_NAME}" "${@}") foundVersion=$(echo "$Out" | head -1 | rev | cut -d" " -f 1 | rev ) if [[ "${foundVersion}" != "${VERSION}" ]]; then echo "error: Invalid Version. Got $foundVersion, expected $VERSION. Error: $Out" @@ -65,10 +60,13 @@ fi startContainer +# stop container +trap 'docker stop "${RUN_NAME}"' EXIT + # Version check -runVersionCheck "etcd" "--version" -runVersionCheck "etcdctl" "version" -runVersionCheck "etcdutl" "version" +runVersionCheck "/usr/local/bin/etcd" "--version" +runVersionCheck "/usr/local/bin/etcdctl" "version" +runVersionCheck "/usr/local/bin/etcdutl" "version" # Put/Get check PUT=$(docker exec "${RUN_NAME}" /usr/local/bin/etcdctl put "${KEY}" "${VALUE}")