From b0c510e8ae740adfe48b0a01253ae1ea9653546a Mon Sep 17 00:00:00 2001 From: vponomaryov Date: Fri, 4 Mar 2016 21:48:19 +0200 Subject: [PATCH] Download service image only when needed Download of Generic/Windows image for Nova should be disabled for all other share drivers in CI. Change-Id: Ib2c952e85dd0a6eb36fe945e0a33950c38dfdfae Closes-Bug: #1553343 --- contrib/ci/pre_test_hook.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh index 59b4ea6e7c..865abdd572 100755 --- a/contrib/ci/pre_test_hook.sh +++ b/contrib/ci/pre_test_hook.sh @@ -61,19 +61,26 @@ else echo "MANILA_MULTI_BACKEND=False" >> $localrc_path fi -if [[ "$DRIVER" == "lvm" ]]; then +MANILA_SERVICE_IMAGE_ENABLED=False +if [[ "$DRIVER" == "generic" ]]; then + MANILA_SERVICE_IMAGE_ENABLED=True + echo "SHARE_DRIVER=manila.share.drivers.generic.GenericShareDriver" >> $localrc_path +elif [[ "$DRIVER" == "windows" ]]; then + MANILA_SERVICE_IMAGE_ENABLED=True + echo "SHARE_DRIVER=manila.share.drivers.windows.windows_smb_driver.WindowsSMBDriver" >> $localrc_path +elif [[ "$DRIVER" == "lvm" ]]; then echo "SHARE_DRIVER=manila.share.drivers.lvm.LVMShareDriver" >> $localrc_path echo "SHARE_BACKING_FILE_SIZE=32000M" >> $localrc_path elif [[ "$DRIVER" == "zfsonlinux" ]]; then echo "SHARE_DRIVER=manila.share.drivers.zfsonlinux.driver.ZFSonLinuxShareDriver" >> $localrc_path echo "RUN_MANILA_REPLICATION_TESTS=True" >> $localrc_path -fi - -if [[ "$DRIVER" == "lxd" ]]; then +elif [[ "$DRIVER" == "lxd" ]]; then echo "SHARE_DRIVER=manila.share.drivers.lxd.LXDDriver" >> $localrc_path echo "SHARE_BACKING_FILE_SIZE=32000M" >> $localrc_path fi +echo "MANILA_SERVICE_IMAGE_ENABLED=$MANILA_SERVICE_IMAGE_ENABLED" >> $localrc_path + # Enabling isolated metadata in Neutron is required because # Tempest creates isolated networks and created vm's in scenario tests don't # have access to Nova Metadata service. This leads to unavailability of