openstack/devstack
Code Issues Proposed changes

Merge "Allow heat tests to use already uploaded test image"

Browse Source
This commit is contained in:
Jenkins 2013-12-15 18:18:53 +00:00 committed by Gerrit Code Review
commit d15512431b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tempest
View File

@ -293,7 +293,9 @@ function configure_tempest() {
iniset $TEMPEST_CONF boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros} iniset $TEMPEST_CONF boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros}
# Orchestration test image # Orchestration test image
if [[ "$HEAT_CREATE_TEST_IMAGE" = "True" ]]; then if [[ ! -z "$HEAT_FETCHED_TEST_IMAGE" ]]; then
iniset $TEMPEST_CONF orchestration image_ref "$HEAT_FETCHED_TEST_IMAGE"
elif [[ "$HEAT_CREATE_TEST_IMAGE" = "True" ]]; then
disk_image_create /usr/share/tripleo-image-elements "vm fedora heat-cfntools" "i386" "fedora-vm-heat-cfntools-tempest" 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" iniset $TEMPEST_CONF orchestration image_ref "fedora-vm-heat-cfntools-tempest"
fi fi