openstack
/
heat
Code Issues Proposed changes

Merge "Stop testing neutron-lbaas in gate jobs"

This commit is contained in:
Zuul 2018-06-07 07:06:37 +00:00 committed by Gerrit Code Review
parent 7d878a88c9 4748dbc4b1
commit 8ee85b074a
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -14,7 +14,7 @@
- openstack/heat
- openstack/heat-tempest-plugin
- openstack/neutron
- openstack/neutron-lbaas
- openstack/octavia
- openstack/oslo.messaging
- openstack/python-barbicanclient
- openstack/python-heatclient

6
heat_integrationtests/pre_test_hook.sh
View File

@ -51,9 +51,3 @@ fi
echo "CEILOMETER_PIPELINE_INTERVAL=60" >> $localconf
echo "HEAT_ENABLE_ADOPT_ABANDON=True" >> $localconf
# Use the lbaas v2 namespace driver for devstack integration testing since
# octavia uses nested vms.
if [[ $OVERRIDE_ENABLED_SERVICES =~ "q-lbaasv2" ]]
then
echo "NEUTRON_LBAAS_SERVICE_PROVIDERV2=LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default" >> $localconf
fi

8
heat_integrationtests/prepare_test_env.sh
View File

@ -79,8 +79,12 @@ function _config_tempest_plugin
# Skip VolumeBackupRestoreIntegrationTest skipped until failure rate can be reduced ref bug #1382300
# Skip test_server_signal_userdata_format_software_config is skipped untill bug #1651768 is resolved
iniset $conf_file heat_plugin skip_scenario_test_list 'SoftwareConfigIntegrationTest, VolumeBackupRestoreIntegrationTest'
iniset $conf_file heat_plugin skip_functional_test_list ''
# Skip AutoscalingLoadBalancerTest and AutoscalingLoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
iniset $conf_file heat_plugin skip_scenario_test_list 'AutoscalingLoadBalancerTest, AutoscalingLoadBalancerv2Test, \
SoftwareConfigIntegrationTest, VolumeBackupRestoreIntegrationTest'
# Skip LoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
iniset $conf_file heat_plugin skip_functional_test_list 'LoadBalancerv2Test'
cat $conf_file
}

8
playbooks/devstack/functional/run.yaml
View File

@ -61,15 +61,13 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
# Enable LBaaS V2 plugin
export PROJECTS="openstack/neutron-lbaas $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas"
# Enable octavia plugin and services
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://git.openstack.org/openstack/octavia"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-xenial.qcow2"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_SIZE=3"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-xenial"
# enabling lbaas plugin does not enable the lbaasv2 service, explicitly enable it
services+=,q-lbaasv2,octavia,o-cw,o-hk,o-hm,o-api
services+=,octavia,o-cw,o-hk,o-hm,o-api
export PROJECTS="openstack/octavia $PROJECTS"
export PROJECTS="openstack/barbican $PROJECTS"
export PROJECTS="openstack/python-barbicanclient $PROJECTS"
export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"