Merge "Remove some scenario jobs from the check and gate queues"

doc/source/contributor/testing/ci_scenario_jobs.rst

@@ -79,14 +79,10 @@ Below is a summary of those jobs.
     +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
     |neutron-ovs-tempest-slow                      |tempest slow tests                |   3.6   |   2   | openvswitch | openvswitch     | legacy   | False | False  | True       | Yes         |
     +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
-    |neutron-ovn-tempest-slow                      |tempest slow tests                |   3.6   |   2   | ovn         | ovn             | ---      | False | False  | True       | Yes         |
-    +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
     |neutron-ovn-tempest-ipv6-only                 |tempest smoke + IPv6 tests        |   3.6   |   1   | ovn         | ovn             | ---   | False | False  | True       | Yes         |
     |                                              |(only tests related to            |         |       |             |                 |          |       |        |            |             |
     |                                              |Neutron and Nova)                 |         |       |             |                 |          |       |        |            |             |
     +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
-    |neutron-ovn-tempest-ovs-release               |Various tempest api, scenario     |   3.6   |   1   | ovn         | ovn             | ---      | False | False  | True       | Yes         |
-    +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
     |neutron-ovn-tempest-ovs-release-ipv6-only     | tempest smoke + IPv6 tests       |   3.6   |   1   | ovn         | ovn             | ---      | False | False  | True       | Yes         |
     +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
 

zuul.d/project.yaml

@@ -26,10 +26,7 @@
             voting: false
         - neutron-ovs-tempest-multinode-full
         - neutron-ovs-tempest-dvr-ha-multinode-full
-        - neutron-ovs-tempest-slow
         - neutron-ovn-tempest-ipv6-only
-        - neutron-ovn-tempest-ovs-release
-        - neutron-ovn-tempest-ovs-release-ipv6-only
         # TODO(slaweq): add this job again to the check queue when it will be
         # working fine on python 3
         #- networking-midonet-tempest-aio-ml2-centos-7:
@@ -54,7 +51,6 @@
             timeout: 3600
         - openstack-tox-cover:  # from openstack-cover-jobs template
             timeout: 4800
-        - neutron-ovn-tempest-slow
         - openstack-tox-py38-arm64:  # from openstack-python3-yoga-jobs-arm64 template
             timeout: 4800
         - openstack-tox-py39-arm64:  # from openstack-python3-yoga-jobs-arm64 template
@@ -69,17 +65,13 @@
         # https://bugs.launchpad.net/neutron/+bug/1920778
         # will be fixed
         # - neutron-ovs-grenade-dvr-multinode
-        - neutron-ovs-tempest-slow
         - neutron-ovn-tempest-ipv6-only
-        - neutron-ovn-tempest-ovs-release
-        - neutron-ovn-tempest-ovs-release-ipv6-only
         - openstack-tox-py36:  # from openstack-python3-yoga-jobs template
             timeout: 3600
         - openstack-tox-py38: # from openstack-python3-yoga-jobs template
             timeout: 3600
         - openstack-tox-lower-constraints:  # from openstack-tox-lower-constraints template
             timeout: 3600
-        - neutron-ovn-tempest-slow
         #- neutron-ovn-rally-task
         #- neutron-ovn-tripleo-ci-centos-8-containers-multinode
 
@@ -100,9 +92,11 @@
       jobs:
         - neutron-functional
         - neutron-fullstack
+        - neutron-ovs-tempest-with-os-ken-master
         - neutron-ovn-tempest-postgres-full
         - neutron-ovn-tempest-mariadb-full
-        - neutron-ovs-tempest-with-os-ken-master
+        - neutron-ovn-tempest-ovs-release
+        - neutron-ovn-tempest-ovs-release-ipv6-only
         - neutron-ovn-tempest-ovs-master-fedora
         - neutron-ovn-tempest-with-neutron-lib-master
         - devstack-tobiko-faults-centos:

zuul.d/tempest-multinode.yaml

@@ -237,72 +237,6 @@
                 bridge_mappings: public:br-ex
                 resource_provider_bandwidths: br-ex:1000000:1000000
 
-- job:
-    name: neutron-ovs-tempest-slow
-    parent: tempest-slow-py3
-    timeout: 10800
-    irrelevant-files: *openvswitch-irrelevant-files
-    vars:
-      devstack_plugins:
-        neutron: https://opendev.org/openstack/neutron.git
-      devstack_localrc:
-        Q_ML2_TENANT_NETWORK_TYPE: vxlan
-        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
-        Q_AGENT: openvswitch
-      devstack_services:
-        br-ex-tcpdump: true
-        br-int-flows: true
-        # Neutron services
-        q-agt: true
-        q-dhcp: true
-        q-l3: true
-        q-meta: true
-        q-metering: true
-        q-svc: true
-        # OVN services
-        ovn-controller: false
-        ovn-northd: false
-        ovs-vswitchd: false
-        ovsdb-server: false
-        q-ovn-metadata-agent: false
-        # Cinder services
-        c-api: false
-        c-bak: false
-        c-sch: false
-        c-vol: false
-        cinder: false
-        # Swift services
-        s-account: false
-        s-container: false
-        s-object: false
-        s-proxy: false
-      devstack_local_conf:
-        post-config:
-          $NEUTRON_L3_CONF:
-            agent:
-              debug_iptables_rules: True
-    group-vars:
-      subnode:
-        devstack_localrc:
-          Q_ML2_TENANT_NETWORK_TYPE: vxlan
-          Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
-          Q_AGENT: openvswitch
-        devstack_services:
-          q-agt: true
-          # OVN services
-          ovn-controller: false
-          ovs-vswitchd: false
-          ovsdb-server: false
-          q-ovn-metadata-agent: false
-          # Cinder services
-          c-bak: false
-          c-vol: false
-        devstack_local_conf:
-          post-config:
-            $NEUTRON_L3_CONF:
-              agent:
-                debug_iptables_rules: True
-
 - job:
     name: neutron-ovn-multinode-base
     description: Base multinode job for devstack/tempest to test Neutron with ovn driver.
@@ -313,7 +247,7 @@
       - openstack/neutron
       - openstack/neutron-tempest-plugin
       - openstack/tempest
-    irrelevant-files:
+    irrelevant-files: &ovn-irrelevant-files
       - ^(test-|)requirements.txt$
       - ^releasenotes/.*$
       - ^doc/.*$
@@ -444,23 +378,6 @@
           ENABLE_TLS: True
 
 
-- job:
-    name: neutron-ovn-tempest-slow
-    parent: neutron-ovn-multinode-base
-    vars:
-      tox_envlist: slow-serial
-      tempest_test_regex: ""
-      # TODO(slaweq): remove tests from
-      # 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_basic_ops.TestNetworkBasicOps.test_update_router_admin_state)"
-
-
 - job:
     # TODO(slaweq): propose job with ovs-release and move -master one to
     # experimental queue

zuul.d/tempest-singlenode.yaml

@@ -477,6 +477,7 @@
       - ^neutron/plugins/ml2/drivers/mech_sriov/.*$
       - ^neutron/scheduler/.*$
 
+# TODO(slaweq): move this to be multinode job when it will be possible in Zuul
 - job:
     name: neutron-ovn-tempest-ipv6-only
     parent: tempest-ipv6-only
@@ -499,7 +500,7 @@
         s-container: false
         s-object: false
         s-proxy: false
-    irrelevant-files: *openvswitch-irrelevant-files
+    irrelevant-files: *ovn-irrelevant-files
 
 - job:
     name: neutron-ovn-tempest-ovs-ipv6-only-base