diff options
author | Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2016-02-16 20:24:56 +0100 |
---|---|---|
committer | Jörgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2016-02-17 16:51:55 +0000 |
commit | c3666affeae842e3c2d8f9191928f3ae4437bc59 (patch) | |
tree | 00862a0718f455a912eff25e63f27c7dfa49da4e /ci/yardstick-verify | |
parent | eb018b61e8c50e8ce8431c2af62ec66d90b0595a (diff) |
ci: Freeze pip requirements + cleanups
Freeze pip requirements for brahmaputra release to make sure we
keep track of dependencies.
Fixes internalURL problem with ericsson-virtual1
Add check to verify that nova, glance and heat services are functional
Change-Id: I15c3d215596eaad31f8e260d129b8e07a7d63976
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
(cherry picked from commit 3b7c8d522d1ef0950d5c79232e161de05689fe53)
Diffstat (limited to 'ci/yardstick-verify')
-rwxr-xr-x | ci/yardstick-verify | 44 |
1 files changed, 30 insertions, 14 deletions
diff --git a/ci/yardstick-verify b/ci/yardstick-verify index 630fed5f5..875b01ff2 100755 --- a/ci/yardstick-verify +++ b/ci/yardstick-verify @@ -54,10 +54,12 @@ while getopts "r:i:h" OPTION; do r) DISPATCHER_TYPE=http DISPATCHER_HTTP_TARGET=http://${OPTARG} + DISPATCHER_FILE_NAME= ;; i) DISPATCHER_TYPE=influxdb DISPATCHER_INFLUXDB_TARGET=http://${OPTARG} + DISPATCHER_FILE_NAME= ;; *) echo "${OPTION} is not a valid argument" @@ -112,10 +114,11 @@ install_yardstick() echo echo "========== Installing yardstick ==========" - if ! sudo python setup.py install; then - echo 'Yardstick installation failed!' - exit 1 - fi + # uninstall previous version + pip uninstall -y yardstick || true + + # Install yardstick + pip install . } build_yardstick_image() @@ -309,15 +312,13 @@ main() echo echo "========== Running Yardstick CI with following parameters ==========" echo "Script options: ${SCRIPT} $SCRIPT_ARGS" - echo "Result API: ${DISPATCHER_HTTP_TARGET:-$DISPATCHER_FILE_NAME}" + echo "Dispatcher: ${DISPATCHER_TYPE} ${DISPATCHER_FILE_NAME}" echo "YARDSTICK_VERSION: ${YARDSTICK_VERSION}" echo "Number of test suites: ${#SUITE_FILES[@]}" for suite in ${SUITE_FILES[*]}; do echo " $suite" done - - # install yardstick - install_yardstick + echo # check if some necessary variables is set if [ -z "$OS_AUTH_URL" ]; then @@ -325,12 +326,27 @@ main() exit 1 fi - # check if the api is up - echo "Checking if OS API is working..." - if ! glance image-list > /dev/null; then - echo "OS API is down" - exit 1 - fi + echo "OS_AUTH_URL is $OS_AUTH_URL" + echo + + # check OpenStack services + echo "Checking OpenStack services:" + for cmd in "glance image-list" "nova list" "heat stack-list"; do + echo " checking ${cmd/%\ */} ..." + if ! $cmd >/dev/null; then + echo "error: command \"$cmd\" failed" + exit 1 + fi + done + + echo + echo "Checking for External network:" + for net in $(neutron net-list --router:external -c name -f value); do + echo " external network: $net" + done + + # install yardstick + install_yardstick cleanup |