openstack
/
manila
Code Issues Proposed changes

Merge "Enable replication tests (DHSS=True) on Dummy driver"

This commit is contained in:
Zuul 2019-09-21 01:03:00 +00:00 committed by Gerrit Code Review
parent 9e858197de d67dee1776
commit 09f5813078
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ci/post_test_hook.sh
View File

@ -253,6 +253,7 @@ elif [[ "$DRIVER" == "dummy" ]]; then
RUN_MANILA_REVERT_TO_SNAPSHOT_TESTS=True
RUN_MANILA_MOUNT_SNAPSHOT_TESTS=True
RUN_MANILA_MIGRATION_WITH_PRESERVE_SNAPSHOTS_TESTS=True
RUN_MANILA_REPLICATION_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 enable_cert_rules_for_protocols ''
@ -266,6 +267,7 @@ elif [[ "$DRIVER" == "dummy" ]]; then
iniset $TEMPEST_CONFIG share multitenancy_enabled True
iniset $TEMPEST_CONFIG share create_networks_when_multitenancy_enabled False
iniset $TEMPEST_CONFIG share multi_backend True
iniset $TEMPEST_CONFIG share backend_replication_type 'readable'
elif [[ "$DRIVER" == "container"* ]]; then
if [[ "$DRIVER" == "container_with_custom_image" ]]; then
# TODO(vponomaryov): set scenario tests for run when

2
contrib/ci/pre_test_hook.sh
View File

@ -109,12 +109,14 @@ elif [[ "$DRIVER" == "dummy" ]]; then
echo "MANILA_OPTGROUP_alpha_share_backend_name=ALPHA" >> $localconf
echo "MANILA_OPTGROUP_alpha_network_config_group=membernet" >> $localconf
echo "MANILA_OPTGROUP_alpha_admin_network_config_group=adminnet" >> $localconf
echo "MANILA_OPTGROUP_alpha_replication_domain=DUMMY_DOMAIN_2" >> $localconf
echo "MANILA_OPTGROUP_beta_share_driver=$driver_path" >> $localconf
echo "MANILA_OPTGROUP_beta_driver_handles_share_servers=True" >> $localconf
echo "MANILA_OPTGROUP_beta_share_backend_name=BETA" >> $localconf
echo "MANILA_OPTGROUP_beta_network_config_group=membernet" >> $localconf
echo "MANILA_OPTGROUP_beta_admin_network_config_group=adminnet" >> $localconf
echo "MANILA_OPTGROUP_beta_replication_domain=DUMMY_DOMAIN_2" >> $localconf
echo "MANILA_OPTGROUP_gamma_share_driver=$driver_path" >> $localconf
echo "MANILA_OPTGROUP_gamma_driver_handles_share_servers=False" >> $localconf