Browse Source

Merge "Switch neutron-rally-task job to ML2/OVS and skip "test_models_sync""

changes/36/794236/2
Zuul 4 months ago
committed by Gerrit Code Review
parent
commit
7e98d18927
  1. 5
      neutron/tests/functional/db/test_migrations.py
  2. 2
      neutron/tests/functional/test_server.py
  3. 11
      zuul.d/project.yaml
  4. 16
      zuul.d/rally.yaml
  5. 5
      zuul.d/tempest-multinode.yaml

5
neutron/tests/functional/db/test_migrations.py

@ -382,13 +382,16 @@ class TestModelsMigrationsMysql(testlib_api.MySQLTestCaseMixin,
@test_base.skip_if_timeout("bug 1687027")
def test_models_sync(self):
self.skipTest('bug 1929518')
super(TestModelsMigrationsMysql, self).test_models_sync()
class TestModelsMigrationsPsql(testlib_api.PostgreSQLTestCaseMixin,
_TestModelsMigrations,
testlib_api.SqlTestCaseLight):
pass
def test_models_sync(self):
self.skipTest('bug 1929518')
super().test_models_sync()
class TestSanityCheck(testlib_api.SqlTestCaseLight):

2
neutron/tests/functional/test_server.py

@ -29,6 +29,7 @@ import psutil
from neutron.common import utils
from neutron import manager
from neutron import service
from neutron.tests import base as tests_base
from neutron.tests.functional import base
from neutron import wsgi
@ -242,6 +243,7 @@ class TestWsgiServer(TestNeutronServer):
server.wait()
@tests_base.unstable_test('bug 1930367')
def test_restart_wsgi_on_sighup_multiple_workers(self):
self._test_restart_service_on_sighup(service=self._run_wsgi,
workers=2)

11
zuul.d/project.yaml

@ -51,7 +51,10 @@
timeout: 3600
- openstack-tox-cover: # from openstack-cover-jobs template
timeout: 4800
- neutron-ovn-tempest-slow
# TODO(ralonsoh): this job has been set to non-voting until LP#1930402
# is fixed.
- neutron-ovn-tempest-slow:
voting: false
gate:
jobs:
- neutron-functional-with-uwsgi
@ -62,7 +65,8 @@
# https://bugs.launchpad.net/neutron/+bug/1920778
# will be fixed
# - neutron-grenade-dvr-multinode
- neutron-tempest-slow-py3
# TODO(obondarev): this job is disabled untill switched back to OVS
#- neutron-tempest-slow-py3
- neutron-tempest-ipv6-only
- neutron-ovn-tempest-ovs-release
- neutron-ovn-tempest-ovs-release-ipv6-only
@ -70,7 +74,8 @@
timeout: 3600
- openstack-tox-lower-constraints: # from openstack-tox-lower-constraints template
timeout: 3600
- neutron-ovn-tempest-slow
# TODO(ralonsoh): this job has been disabled until LP#1930402 is fixed.
#- neutron-ovn-tempest-slow:
#- neutron-ovn-rally-task
#- neutron-ovn-tripleo-ci-centos-8-containers-multinode

16
zuul.d/rally.yaml

@ -7,6 +7,9 @@
USE_PYTHON3: true
OSPROFILER_COLLECTOR: redis
OSPROFILER_HMAC_KEYS: "neutron-hmac-key-used-in-zuul-ci"
Q_ML2_TENANT_NETWORK_TYPE: vxlan
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
Q_AGENT: openvswitch
rally_task: rally-jobs/task-neutron.yaml
devstack_plugins:
osprofiler: https://opendev.org/openstack/osprofiler
@ -25,6 +28,19 @@
s-container: false
s-object: false
s-proxy: false
# OVN services
ovn-controller: false
ovn-northd: false
ovs-vswitchd: false
ovsdb-server: false
q-ovn-metadata-agent: false
# Neutron services
q-agt: true
q-dhcp: true
q-l3: true
q-meta: true
q-metering: true
q-svc: true
devstack_local_conf:
post-config:
$NEUTRON_CONF:

5
zuul.d/tempest-multinode.yaml

@ -357,8 +357,11 @@
# tempest.scenario.test_network_v6.TestGettingAddress module from
# prohibit list when bug https://bugs.launchpad.net/neutron/+bug/1863577
# will be fixed
# TODO(ralonsoh): "test_update_router_admin_state" excluded until bug
# https://bugs.launchpad.net/neutron/+bug/1890445 is fixed.
tempest_exclude_regex: "\
(^tempest.scenario.test_network_v6.TestGettingAddress)"
(^tempest.scenario.test_network_v6.TestGettingAddress)|\
(^tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_update_router_admin_state)"
- job:

Loading…
Cancel
Save