mirror of
https://github.com/etcd-io/etcd.git
synced 2024-09-27 06:25:44 +00:00
Incorporate review comments
Signed-off-by: Prasad Chandrasekaran <prasadc@vmware.com>
This commit is contained in:
parent
d5e5f1b542
commit
ab2a1b7ad6
@ -15,13 +15,8 @@ function startContainer {
|
|||||||
sleep 5
|
sleep 5
|
||||||
}
|
}
|
||||||
|
|
||||||
# stop container
|
|
||||||
trap 'docker stop "${RUN_NAME}"' EXIT
|
|
||||||
|
|
||||||
function runVersionCheck {
|
function runVersionCheck {
|
||||||
binary="/usr/local/bin/""$1"
|
Out=$(docker exec "${RUN_NAME}" "${@}")
|
||||||
versionString="$2"
|
|
||||||
Out=$(docker exec "${RUN_NAME}" "${binary}" "${versionString}")
|
|
||||||
foundVersion=$(echo "$Out" | head -1 | rev | cut -d" " -f 1 | rev )
|
foundVersion=$(echo "$Out" | head -1 | rev | cut -d" " -f 1 | rev )
|
||||||
if [[ "${foundVersion}" != "${VERSION}" ]]; then
|
if [[ "${foundVersion}" != "${VERSION}" ]]; then
|
||||||
echo "error: Invalid Version. Got $foundVersion, expected $VERSION. Error: $Out"
|
echo "error: Invalid Version. Got $foundVersion, expected $VERSION. Error: $Out"
|
||||||
@ -65,10 +60,13 @@ fi
|
|||||||
|
|
||||||
startContainer
|
startContainer
|
||||||
|
|
||||||
|
# stop container
|
||||||
|
trap 'docker stop "${RUN_NAME}"' EXIT
|
||||||
|
|
||||||
# Version check
|
# Version check
|
||||||
runVersionCheck "etcd" "--version"
|
runVersionCheck "/usr/local/bin/etcd" "--version"
|
||||||
runVersionCheck "etcdctl" "version"
|
runVersionCheck "/usr/local/bin/etcdctl" "version"
|
||||||
runVersionCheck "etcdutl" "version"
|
runVersionCheck "/usr/local/bin/etcdutl" "version"
|
||||||
|
|
||||||
# Put/Get check
|
# Put/Get check
|
||||||
PUT=$(docker exec "${RUN_NAME}" /usr/local/bin/etcdctl put "${KEY}" "${VALUE}")
|
PUT=$(docker exec "${RUN_NAME}" /usr/local/bin/etcdctl put "${KEY}" "${VALUE}")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user