openstack
/
magnum
Code Issues Proposed changes

Merge "Allow to parameterize image name in tests"

This commit is contained in:
Jenkins 2016-03-22 04:23:46 +00:00 committed by Gerrit Code Review
parent b0ce382cf1 2471fa66c6
commit 6d17c5a9a3
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
magnum/tests/contrib/post_test_hook.sh
View File

@ -28,10 +28,18 @@ function create_test_data {
# a baymodel, bay and a pod
coe=$1
local image_name="fedora-21-atomic"
if [ $coe == 'mesos' ]; then
image_name="ubuntu-14.04"
local image_name="ubuntu-14.04"
else
local image_name="fedora-21-atomic"
fi
# if we have the MAGNUM_IMAGE_NAME setting, use it instead
# of the default one. In combination with MAGNUM_GUEST_IMAGE_URL
# setting, it allows to perform testing on custom images.
image_name=${MAGNUM_IMAGE_NAME:-$image_name}
export NIC_ID=$(neutron net-show public | awk '/ id /{print $4}')
export IMAGE_ID=$(glance --os-image-api-version 1 image-list | grep $image_name | awk '{print $2}')