openstack
/
manila
Code Issues Proposed changes

Merge "Enable IPv6 scenario tests in Upstream CI"

This commit is contained in:
Zuul 2018-01-25 16:14:33 +00:00 committed by Gerrit Code Review
parent 9d56fe17b3 c4449bc4e2
commit 0d1d5a0642
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/ci/post_test_hook.sh
View File

@ -179,6 +179,7 @@ if [[ "$DRIVER" == "lvm" ]]; then
RUN_MANILA_SHRINK_TESTS=False
RUN_MANILA_REVERT_TO_SNAPSHOT_TESTS=True
RUN_MANILA_MOUNT_SNAPSHOT_TESTS=True
RUN_MANILA_IPV6_TESTS=True
iniset $TEMPEST_CONFIG share enable_ip_rules_for_protocols 'nfs'
iniset $TEMPEST_CONFIG share enable_user_rules_for_protocols 'cifs'
iniset $TEMPEST_CONFIG share image_with_share_tools 'manila-service-image-master'

1
contrib/ci/pre_test_hook.sh
View File

@ -143,6 +143,7 @@ elif [[ "$DRIVER" == "lvm" ]]; then
echo "SHARE_DRIVER=manila.share.drivers.lvm.LVMShareDriver" >> $localconf
echo "SHARE_BACKING_FILE_SIZE=32000M" >> $localconf
export MANILA_SETUP_IPV6=True
elif [[ "$DRIVER" == "zfsonlinux" ]]; then
MANILA_SERVICE_IMAGE_ENABLED=True
echo "SHARE_DRIVER=manila.share.drivers.zfsonlinux.driver.ZFSonLinuxShareDriver" >> $localconf

3
playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
View File

@ -54,6 +54,9 @@
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
export MANILA_SETUP_IPV6=True
export RUN_MANILA_IPV6_TESTS=True
# Basic services needed for minimal job
OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
if [ "lvm" == "lvm" ]; then