From d2cb234be4b5e6d70635fc7578d951a42a41cc4a Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Thu, 2 Apr 2015 11:08:24 -0400 Subject: [PATCH] Set qcow image file location with right cirros version This commit ensures we also set the qcow image location in the tempest config when we update qcow version. The tempest config has a default value for img_file (which is incorrect) but before we can remove the defaults in tempest we need to ensure devstack is using it properly first. The only reason the tests weren't failing here is because tempest falls back to using uec images (which devstack was correctly setting config for) if qcow isn't found. The img_dir was also hardcoded assuming a uec image, however if qcow is intended to be used you'll need to be able to override that, which is added as part of this commit. Change-Id: I05af346b3c9be9560dc8846dd1f437cfbb2d5005 --- lib/tempest | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/tempest b/lib/tempest index 3f33512cf6..7d7cf11469 100644 --- a/lib/tempest +++ b/lib/tempest @@ -401,10 +401,12 @@ function configure_tempest { fi # Scenario - iniset $TEMPEST_CONFIG scenario img_dir "$FILES/images/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec" + SCENARIO_IMAGE_DIR=${SCENARIO_IMAGE_DIR:-$FILES/images/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-uec} + iniset $TEMPEST_CONFIG scenario img_dir $SCENARIO_IMAGE_DIR iniset $TEMPEST_CONFIG scenario ami_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-blank.img" iniset $TEMPEST_CONFIG scenario ari_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd" iniset $TEMPEST_CONFIG scenario aki_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-vmlinuz" + iniset $TEMPEST_CONFIG scenario img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img" # Large Ops Number iniset $TEMPEST_CONFIG scenario large_ops_number ${TEMPEST_LARGE_OPS_NUMBER:-0}