diff options
| author | gord chung <gord@live.ca> | 2017-02-15 22:55:18 +0000 |
|---|---|---|
| committer | gord chung <gord@live.ca> | 2017-02-15 22:55:18 +0000 |
| commit | 6d1deb5c50d139fc5648bf20385df62defe32e37 (patch) | |
| tree | 3ad5fc583025eea02f38eac044bd242c255dceed | |
| parent | 9400d9e666e9245da62504f4505872a6a3532fe4 (diff) | |
| download | ceilometer-7.0.2.tar.gz | |
match generic cirros name7.0.2
devstack/tempest removed cirros ami image for qcow image[1][2]. this changes
suffix of file. this patch generically looks for first cirros match and
disregards suffix
[1] https://review.openstack.org/#/c/338435/
[2] https://review.openstack.org/#/c/338377/
Change-Id: Iefcfe839916e0501cd82daa6f538b440a8d8ee96
(cherry picked from commit a622ab3013f2cfab4fa2d2725e745e88dca5fb55)
| -rwxr-xr-x | ceilometer/tests/integration/hooks/post_test_hook.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ceilometer/tests/integration/hooks/post_test_hook.sh b/ceilometer/tests/integration/hooks/post_test_hook.sh index fbc69a7e..077e336e 100755 --- a/ceilometer/tests/integration/hooks/post_test_hook.sh +++ b/ceilometer/tests/integration/hooks/post_test_hook.sh @@ -43,7 +43,7 @@ export AODH_SERVICE_URL=$(openstack catalog show alarming -c endpoints -f value export GNOCCHI_SERVICE_URL=$(openstack catalog show metric -c endpoints -f value | awk '/public/{print $2}') export HEAT_SERVICE_URL=$(openstack catalog show orchestration -c endpoints -f value | awk '/public/{print $2}') export NOVA_SERVICE_URL=$(openstack catalog show compute -c endpoints -f value | awk '/public/{print $2}') -export GLANCE_IMAGE_NAME=$(openstack image list | awk '/ cirros.*uec /{print $4}') +export GLANCE_IMAGE_NAME=$(openstack image list | awk '/ cirros.* /{print $4; exit}') export ADMIN_TOKEN=$(openstack token issue -c id -f value) # Run tests |