Merge "[stable/wallaby] Drop -master jobs" into stable/wallaby

doc/source/contributor/testing/ci_scenario_jobs.rst

@@ -119,11 +119,6 @@ Currently we have in that queue jobs like listed below.
     | Job name                                     | Run tests                        | python  | nodes | L2 agent    | firewall        | L3 agent | L3 HA | L3 DVR | enable_dvr | Run in gate |
     |                                              |                                  | version |       |             | driver          | mode     |       |        |            | queue       |
     +==============================================+==================================+=========+=======+=============+=================+==========+=======+========+============+=============+
-    |neutron-tempest-with-neutron-lib-master       |tempest.api (without slow tests)  |   3.6   |   1   | openvswitch | openvswitch     | legacy   | False | False  | True       | No          |
-    |                                              |tempest.scenario                  |         |       |             |                 |          |       |        |            |             |
-    |                                              |(only tests related to            |         |       |             |                 |          |       |        |            |             |
-    |                                              |Neutron and Nova)                 |         |       |             |                 |          |       |        |            |             |
-    +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
     |neutron-tempest-with-uwsgi-loki               |tempest.api (without slow tests)  |   3.6   |   1   | openvswitch | openvswitch     | legacy   | False | False  | True       | No          |
     |(non-voting)                                  |tempest.scenario                  |         |       |             |                 |          |       |        |            |             |
     |                                              |(only tests related to            |         |       |             |                 |          |       |        |            |             |
@@ -131,9 +126,6 @@ Currently we have in that queue jobs like listed below.
     +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
     |neutron-ovn-tempest-slow                      |tempest slow tests                |   3.6   |   2   | ovn         | ovn             | ---      | False | False  | True       | No          |
     +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
-    |neutron-ovn-tempest-multinode-ovs-master      |Various tempest api, scenario     |   3.6   |   2   | ovn         | ovn             | ---      | False | False  | True       | No          |
-    |                                              |and neutron_tempest_plugi tests   |         |       |             |                 |          |       |        |            |             |
-    +----------------------------------------------+----------------------------------+---------+-------+-------------+-----------------+----------+-------+--------+------------+-------------+
 
 And we also have Grenade jobs in the experimental queue.
 ::

zuul.d/project.yaml

@@ -78,8 +78,6 @@
       jobs:
         - neutron-grenade-ovn
         - neutron-tempest-with-uwsgi-loki
-        - neutron-ovn-tempest-full-multinode-ovs-master
-        - neutron-tempest-with-neutron-lib-master
 
     periodic:
       jobs:
@@ -87,8 +85,6 @@
         - neutron-fullstack
         - neutron-tempest-postgres-full
         - neutron-tempest-mariadb-full
-        - neutron-tempest-with-os-ken-master
-        - neutron-ovn-tempest-ovs-master-fedora
         - devstack-tobiko-faults-centos:
             voting: true
         - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa

zuul.d/tempest-multinode.yaml

@@ -348,56 +348,3 @@
       tempest_exclude_regex: "\
           (?:tempest.scenario.test_network_basic_ops.TestNetworkBasicOps.test_port_security_macspoofing_port)|\
           (^tempest.scenario.test_network_v6.TestGettingAddress)"
-
-
-- job:
-    # TODO(slaweq): propose job with ovs-release and move -master one to
-    # experimental queue
-    name: neutron-ovn-tempest-full-multinode-ovs-master
-    parent: neutron-ovn-multinode-base
-    vars:
-      tox_envlist: all
-      tempest_test_regex: "^(?!.*\
-          (?:.*\\[.*slow.*\\])|\
-          (?:tempest.api.network.admin.test_quotas.QuotasTest.test_lbaas_quotas.*)|\
-          (?:tempest.api.network.test_load_balancer.*)|\
-          (?:tempest.scenario.test_load_balancer.*)|\
-          (?:tempest.api.network.admin.test_load_balancer.*)|\
-          (?:tempest.api.network.admin.test_lbaas.*)|\
-          (?:tempest.api.network.test_fwaas_extensions.*)|\
-          (?:tempest.api.network.test_metering_extensions.*)|\
-          (?:tempest.thirdparty.boto.test_s3.*)|\
-          (?:tempest.api.identity*)|\
-          (?:tempest.api.image*)|\
-          (?:tempest.api.volume*)|\
-          (?:tempest.api.compute.images*)|\
-          (?:tempest.api.compute.keypairs*)|\
-          (?:tempest.api.compute.certificates*)|\
-          (?:tempest.api.compute.flavors*)|\
-          (?:tempest.api.compute.test_quotas*)|\
-          (?:tempest.api.compute.test_versions*)|\
-          (?:tempest.api.compute.volumes*)|\
-          (?:tempest.api.compute.admin.test_flavor*)|\
-          (?:tempest.api.compute.admin.test_volume*)|\
-          (?:tempest.api.compute.admin.test_hypervisor*)|\
-          (?:tempest.api.compute.admin.test_aggregate*)|\
-          (?:tempest.api.compute.admin.test_quota*)|\
-          (?:tempest.scenario.test_volume*))\
-          ((^neutron_tempest_plugin.api)|\
-          (^neutron_tempest_plugin.scenario)|\
-          (tempest.(api|scenario|thirdparty))).*$"
-      zuul_copy_output:
-        '{{ devstack_base_dir }}/data/ovs': 'logs'
-        '{{ devstack_base_dir }}/data/ovn': 'logs'
-        '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
-        '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
-      devstack_localrc:
-        OVN_BUILD_FROM_SOURCE: True
-        OVN_BRANCH: master
-        OVS_BRANCH: master
-    group-vars:
-      subnode:
-        devstack_localrc:
-          OVN_BUILD_FROM_SOURCE: True
-          OVN_BRANCH: master
-          OVS_BRANCH: master

zuul.d/tempest-singlenode.yaml

@@ -223,73 +223,6 @@
     pre-run: playbooks/add_mariadb_repo.yaml
     irrelevant-files: *tempest-db-irrelevant-files
 
-- job:
-    name: neutron-tempest-with-os-ken-master
-    parent: tempest-integrated-networking
-    timeout: 10800
-    required-projects:
-      - openstack/neutron
-      - openstack/tempest
-      - openstack/os-ken
-    vars:
-      devstack_plugins:
-        neutron: https://opendev.org/openstack/neutron.git
-      devstack_services:
-        br-ex-tcpdump: true
-        br-int-flows: true
-        # 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
-    irrelevant-files:
-      - ^(test-|)requirements.txt$
-      - ^.*\.rst$
-      - ^doc/.*$
-      - ^neutron/locale/.*$
-      - ^neutron/tests/unit/.*$
-      - ^releasenotes/.*$
-      - ^setup.cfg$
-      - ^tools/.*$
-      - ^tox.ini$
-      - ^vagrant/.*$
-      - ^neutron/agent/windows/.*$
-      - ^neutron/plugins/ml2/drivers/linuxbridge/.*$
-      - ^neutron/plugins/ml2/drivers/macvtap/.*$
-      - ^neutron/plugins/ml2/drivers/mech_sriov/.*$
-
-- job:
-    name: neutron-tempest-with-neutron-lib-master
-    parent: tempest-integrated-networking
-    timeout: 10800
-    required-projects:
-      - openstack/neutron
-      - openstack/tempest
-      - openstack/neutron-lib
-    vars:
-      devstack_plugins:
-        neutron: https://opendev.org/openstack/neutron.git
-      devstack_services:
-        br-ex-tcpdump: true
-        br-int-flows: true
-        # 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
-
 - job:
     name: neutron-tempest-with-uwsgi
     parent: tempest-integrated-networking
@@ -467,38 +400,6 @@
         s-proxy: false
     irrelevant-files: *openvswitch-irrelevant-files
 
-- job:
-    name: neutron-ovn-tempest-ovs-master-fedora
-    description: Job testing for devstack/tempest testing Neutron with ovn driver and OVN master branch and Fedora
-    parent: neutron-ovn-base
-    nodeset: devstack-single-node-fedora-latest
-    vars:
-      zuul_copy_output:
-        '{{ devstack_base_dir }}/data/ovs': 'logs'
-        '{{ devstack_base_dir }}/data/ovn': 'logs'
-        '{{ devstack_log_dir }}/ovsdb-server-nb.log': 'logs'
-        '{{ devstack_log_dir }}/ovsdb-server-sb.log': 'logs'
-      devstack_localrc:
-        OVN_BUILD_FROM_SOURCE: True
-        OVN_BRANCH: master
-        OVS_BRANCH: master
-      devstack_services:
-        etcd: false
-        br-ex-tcpdump: true
-        br-int-flows: true
-        tls-proxy: 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
-
 - job:
     name: neutron-ovn-tempest-ovs-ipv6-only-base
     description: Base job for devstack/tempest to test Neutron with ovn driver in an IPv6-only deployment