openstack/devstack
Code Issues Proposed changes

Merge "Generate heat images for tempest tests"

Browse Source
This commit is contained in:
Jenkins 2013-08-13 20:48:48 +00:00 committed by Gerrit Code Review
commit 27899ccc1f
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/heat
View File

@ -197,6 +197,21 @@ function stop_heat() {
done done
} }
function disk_image_create {
local elements_path=$1
local elements=$2
local arch=$3
local output=$TOP_DIR/files/$4
if [[ -f "$output.qcow2" ]];
then
echo "Image file already exists: $output_file"
else
ELEMENTS_PATH=$elements_path disk-image-create \
$elements -a $arch -o $output
fi
# upload with fake URL so that image in $TOP_DIR/files is used
upload_image "http://localhost/$output.qcow2" $TOKEN
}
# Restore xtrace # Restore xtrace
$XTRACE $XTRACE

7
lib/tempest
View File

@ -24,6 +24,7 @@
# ``DEFAULT_INSTANCE_TYPE`` # ``DEFAULT_INSTANCE_TYPE``
# ``DEFAULT_INSTANCE_USER`` # ``DEFAULT_INSTANCE_USER``
# ``CINDER_MULTI_LVM_BACKEND`` # ``CINDER_MULTI_LVM_BACKEND``
# ``HEAT_CREATE_TEST_IMAGE``
# ``stack.sh`` calls the entry points in this order: # ``stack.sh`` calls the entry points in this order:
# #
# install_tempest # install_tempest
@ -272,6 +273,12 @@ function configure_tempest() {
iniset $TEMPEST_CONF boto http_socket_timeout 30 iniset $TEMPEST_CONF boto http_socket_timeout 30
iniset $TEMPEST_CONF boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros} iniset $TEMPEST_CONF boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros}
# Orchestration test image
if [ $HEAT_CREATE_TEST_IMAGE == "True" ]; then
disk_image_create /usr/share/tripleo-image-elements "vm fedora heat-cfntools" "i386" "fedora-vm-heat-cfntools-tempest"
iniset $TEMPEST_CONF orchestration image_ref "fedora-vm-heat-cfntools-tempest"
fi
# Scenario # Scenario
iniset $TEMPEST_CONF scenario img_dir "$FILES/images/cirros-0.3.1-x86_64-uec" iniset $TEMPEST_CONF scenario img_dir "$FILES/images/cirros-0.3.1-x86_64-uec"