From db76887b1d061f6bd175d864b9672564c841773f Mon Sep 17 00:00:00 2001 From: Mehdi Abaakouk Date: Wed, 29 Jul 2015 08:50:49 +0200 Subject: [PATCH] functionnal: fix gating Since devstack creates endpoint with v3 API, "openstack endpoint list" returns a empty list, see: https://bugs.launchpad.net/keystone/+bug/1470635 This change is a workaround to this. Change-Id: I1c406446ceea35df9ab33f98cebdadb59cd7ceef --- aodh/tests/functional/hooks/post_test_hook.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/aodh/tests/functional/hooks/post_test_hook.sh b/aodh/tests/functional/hooks/post_test_hook.sh index 436a4dcf..261cca97 100755 --- a/aodh/tests/functional/hooks/post_test_hook.sh +++ b/aodh/tests/functional/hooks/post_test_hook.sh @@ -14,6 +14,8 @@ # This script is executed inside post_test_hook function in devstack gate. +set -e + function generate_testr_results { if [ -f .testrepository/0 ]; then sudo .tox/functional/bin/testr last --subunit > $WORKSPACE/testrepository.subunit @@ -34,8 +36,8 @@ if [ -f $BASE/new/devstack ]; then JENKINS_USER=jenkins sudo chown -R jenkins:stack $AODH_DIR source $BASE/new/devstack/openrc admin admin - openstack endpoint list - export AODH_SERVICE_URL=$(openstack endpoint show alarming -c publicurl -f value) + openstack catalog list + export AODH_SERVICE_URL=$(openstack catalog show alarming -c endpoints -f value | awk '/publicURL/{print $2}') export AODH_SERVICE_TOKEN=$(openstack token issue -c id -f value) # Go to the aodh dir cd $AODH_DIR