diff --git a/jenkins/ci.suse.de/openstack-crowbar-tests.yaml b/jenkins/ci.suse.de/openstack-crowbar-tests.yaml index b781c016e8..aa065e0898 100644 --- a/jenkins/ci.suse.de/openstack-crowbar-tests.yaml +++ b/jenkins/ci.suse.de/openstack-crowbar-tests.yaml @@ -51,7 +51,7 @@ default-value: '' value: >- smoke,keystone,swift,glance,cinder,neutron,nova,ceilometer,barbican,fwaas, - trove,aodh,heat,magnum,manila,lbaas,designate + trove,aodh,heat,magnum,manila,lbaas,lbaas-octavia,designate description: >- Name of the filter file to use for tempest. Selecting multiple values will run tempest for each selected value. diff --git a/jenkins/ci.suse.de/templates/cloud-crowbar-pipeline-template.yaml b/jenkins/ci.suse.de/templates/cloud-crowbar-pipeline-template.yaml index 0573c5a765..d4361265ee 100644 --- a/jenkins/ci.suse.de/templates/cloud-crowbar-pipeline-template.yaml +++ b/jenkins/ci.suse.de/templates/cloud-crowbar-pipeline-template.yaml @@ -297,7 +297,7 @@ default-value: '{tempest_filter_list|}' value: >- smoke,keystone,swift,glance,cinder,neutron,nova,ceilometer,barbican,fwaas, - trove,aodh,heat,magnum,manila,lbaas,designate + trove,aodh,heat,magnum,manila,lbaas,lbaas-octavia,designate description: >- Name of the filter file to use for tempest. Selecting multiple values will run tempest for each selected value. diff --git a/scripts/jenkins/cloud/ansible/roles/cloud_generator/templates/mkcloud.config.j2 b/scripts/jenkins/cloud/ansible/roles/cloud_generator/templates/mkcloud.config.j2 index b1b09c282f..31740ac2bb 100644 --- a/scripts/jenkins/cloud/ansible/roles/cloud_generator/templates/mkcloud.config.j2 +++ b/scripts/jenkins/cloud/ansible/roles/cloud_generator/templates/mkcloud.config.j2 @@ -109,6 +109,10 @@ export want_all_ssl=1 export want_designate_proposal=1 {% endif %} +{% if 'octavia' in deployments %} +export want_octavia_proposal=1 +{% endif %} + # export ironicnetmask= # Use this to override the crowbar node list order in qa_crowbarsetup.sh diff --git a/scripts/qa_crowbarsetup.sh b/scripts/qa_crowbarsetup.sh index a998e09978..24ed7df24b 100644 --- a/scripts/qa_crowbarsetup.sh +++ b/scripts/qa_crowbarsetup.sh @@ -3761,6 +3761,23 @@ id-301f5a30-1c6f-4ea0-be1a-91fd28d44354 id-bdbb5441-9204-419d-a225-b4fdbfb1a1a8 id-6bba729b-3fb6-494b-9e1e-82bbd89a1045 EOF + + if [[ $want_octavia_proposal > 0 ]]; then + cat - > $blacklistfile << EOF +# The lbaasv2-proxy service plugin doesn't handle the `http_method` attribute correctly (SOC-10965) +# Upstream bug https://storyboard.openstack.org/#!/story/2006909 +neutron_lbaas.tests.tempest.v2.api.test_health_monitors_non_admin.TestHealthMonitors.test_list_health_monitors_two + +# There is no Octavia counterpart for neutron service flavors and flavors +# cannot be transparently handled by the lbaasv2-proxy service plugin +neutron_lbaas.tests.tempest.v2.api.test_load_balancers_non_admin.LoadBalancersTestJSON.test_create_load_balancer_invalid_flavor_field + +# Updating a load balancer with an empty body is not handled by the lbaasv2-proxy service plugin +neutron_lbaas.tests.tempest.v2.api.test_load_balancers_non_admin.LoadBalancersTestJSON.test_update_load_balancer_missing_admin_state_up +neutron_lbaas.tests.tempest.v2.api.test_load_balancers_non_admin.LoadBalancersTestJSON.test_update_load_balancer_missing_description +neutron_lbaas.tests.tempest.v2.api.test_load_balancers_non_admin.LoadBalancersTestJSON.test_update_load_balancer_missing_name +EOF + fi fi tempest cleanup --init-saved-state