aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingLu5 <lvjing5@huawei.com>2017-07-25 03:21:30 +0000
committerJingLu5 <lvjing5@huawei.com>2017-07-26 00:58:10 +0000
commit969ca57ec3bb297eca0d6c65b16ec55be512ae28 (patch)
tree4277d96cd2592e876dd3de1b18a6411c4649d52f
parentd29df23ae5057fe0ccded6f8d8f3e36a084a78b3 (diff)
Bugfix: supoort insecure mode in checking openstack environment
Change-Id: I18346aa177689bc995eb7d4883f4a66383e827ba Signed-off-by: JingLu5 <lvjing5@huawei.com>
-rwxr-xr-xtests/ci/yardstick-verify7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index 751cf65f3..90854d46d 100755
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -293,8 +293,13 @@ main()
echo
# check OpenStack services
+ if [[ $OS_INSECURE ]] && [[ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]]; then
+ SECURE="--insecure"
+ else
+ SECURE=""
+ fi
echo "Checking OpenStack services:"
- for cmd in "openstack image list" "openstack server list" "openstack stack list"; do
+ for cmd in "openstack ${SECURE} image list" "openstack ${SECURE} server list" "openstack ${SECURE} stack list"; do
echo " checking ${cmd} ..."
if ! $cmd >/dev/null; then
echo "error: command \"$cmd\" failed"