Browse code
Allow heat tests to use already uploaded test image
If $HEAT_FETCHED_TEST_IMAGE is set then tempest is configured to
use the image named $HEAT_FETCHED_TEST_IMAGE for any orchestration
tests which require an image.
Fallback to checking $HEAT_CREATE_TEST_IMAGE and invoking
diskimage-builder if necessary.
The intent is to use Fedora 20 as the test image for gating
since this image has heat-cfntools already installed.
Change-Id: I177ae091a641ba99fd4c618e30a39c5148ae617f
Steve Baker authored on 2013/12/04 13:01:01Showing 1 changed files
| ... | ... |
@@ -281,7 +281,9 @@ function configure_tempest() {
|
| 281 | 281 |
iniset $TEMPEST_CONF boto ssh_user ${DEFAULT_INSTANCE_USER:-cirros}
|
| 282 | 282 |
|
| 283 | 283 |
# Orchestration test image |
| 284 |
- if [[ "$HEAT_CREATE_TEST_IMAGE" = "True" ]]; then |
|
| 284 |
+ if [[ ! -z "$HEAT_FETCHED_TEST_IMAGE" ]]; then |
|
| 285 |
+ iniset $TEMPEST_CONF orchestration image_ref "$HEAT_FETCHED_TEST_IMAGE" |
|
| 286 |
+ elif [[ "$HEAT_CREATE_TEST_IMAGE" = "True" ]]; then |
|
| 285 | 287 |
disk_image_create /usr/share/tripleo-image-elements "vm fedora heat-cfntools" "i386" "fedora-vm-heat-cfntools-tempest" |
| 286 | 288 |
iniset $TEMPEST_CONF orchestration image_ref "fedora-vm-heat-cfntools-tempest" |
| 287 | 289 |
fi |