diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 1e6400eb4d7..1a13f04e8b9 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -45,7 +45,7 @@ irrelevant-files: *irrelevant-files - tempest-slow-py3: irrelevant-files: *irrelevant-files - #- neutron-ovn-tempest-ovs-release + - neutron-ovn-tempest-ovs-release - networking-midonet-tempest-aio-ml2-centos-7: voting: false irrelevant-files: *irrelevant-files @@ -87,7 +87,7 @@ irrelevant-files: *irrelevant-files - tempest-ipv6-only: irrelevant-files: *irrelevant-files - #- neutron-ovn-tempest-ovs-release + - neutron-ovn-tempest-ovs-release #- neutron-ovn-rally-task #- neutron-ovn-tripleo-ci-centos-7-containers-multinode diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml index cbf5f232129..a7eb4c80995 100644 --- a/zuul.d/tempest-singlenode.yaml +++ b/zuul.d/tempest-singlenode.yaml @@ -151,7 +151,6 @@ timeout: 10800 required-projects: - openstack/devstack-gate - - openstack/networking-ovn - openstack/neutron - openstack/neutron-tempest-plugin - openstack/octavia @@ -191,6 +190,10 @@ (tempest.(api|scenario|thirdparty))).*$" tempest_concurrency: 2 devstack_localrc: + Q_AGENT: ovn + Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger + Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve + Q_ML2_TENANT_NETWORK_TYPE: geneve Q_USE_PROVIDERNET_FOR_PUBLIC: true PHYSICAL_NETWORK: public ENABLE_CHASSIS_AS_GW: true @@ -206,7 +209,7 @@ ADVANCED_INSTANCE_USER: ubuntu BUILD_TIMEOUT: 784 devstack_plugins: - networking-ovn: https://opendev.org/openstack/networking-ovn + neutron: https://opendev.org/openstack/neutron neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin octavia: https://opendev.org/openstack/octavia zuul_copy_output: @@ -231,7 +234,7 @@ n-novnc-cell1: true n-sch: true n-super-cond: true - networking-ovn-metadata-agent: true + neutron-ovn-metadata-agent: true o-api: true o-hk: true ovn-controller: true