commit 5a3d2adce337777d58d7c6d94787647d177c8712
Author: Bernard Cafarelli <bcafarel@redhat.com>
Date:   Thu Oct 8 14:32:29 2020 +0200

    [Stable only] Drop *-master jobs
    
    These jobs are used to test neutron against current master branches of
    external projects (OVS/OVN, os-ken).
    
    Stable branches are not expected to run with this setup so we can drop
    the jobs there (especially as some of these jobs are periodic ones).
    
    Change-Id: I3e2a0c6d14b49e8e627589cab899dbf7e13e5143

diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 08ee64e..6575599 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -73,8 +73,6 @@
             voting: false
         - neutron-ovn-tempest-slow:
             voting: false
-        - neutron-ovn-tempest-full-multinode-ovs-master:
-            voting: false
         - openstack-tox-py36:  # from openstack-python3-victoria-jobs template
             timeout: 3600
         - openstack-tox-py38:  # from openstack-python3-victoria-jobs template
@@ -105,15 +103,9 @@
         #- neutron-ovn-rally-task
         #- neutron-ovn-tripleo-ci-centos-8-containers-multinode
 
-    experimental:
-      jobs:
-        - neutron-ovn-tempest-ovs-master
-
     periodic:
       jobs:
         - neutron-functional
         - neutron-fullstack
         - neutron-tempest-postgres-full
         - neutron-tempest-mariadb-full
-        - neutron-tempest-with-os-ken-master
-        - neutron-ovn-tempest-ovs-master-fedora
diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index f6959d6..bbf1753 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -230,49 +230,3 @@
       tempest_black_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-plugin
-      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))).*$"
-      devstack_localrc:
-        OVN_BRANCH: master
-        OVS_BRANCH: master
-    group-vars:
-      subnode:
-        devstack_localrc:
-          OVN_BRANCH: master
-          OVS_BRANCH: master
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index ba1b38d..a70ef97 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -161,32 +161,6 @@
     irrelevant-files: *irrelevant-files
 
 - job:
-    name: neutron-tempest-with-os-ken-master
-    parent: tempest-integrated-networking
-    timeout: 10800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/neutron
-      - openstack/tempest
-      - openstack/os-ken
-    vars:
-      devstack_plugins:
-        neutron: https://opendev.org/openstack/neutron.git
-
-- job:
-    name: neutron-tempest-with-neutron-lib-master
-    parent: tempest-integrated-networking
-    timeout: 10800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/neutron
-      - openstack/tempest
-      - openstack/neutron-lib
-    vars:
-      devstack_plugins:
-        neutron: https://opendev.org/openstack/neutron.git
-
-- job:
     name: neutron-tempest-with-uwsgi
     parent: tempest-integrated-networking
     description: Run neutron Tempest tests with uwsgi
@@ -285,14 +259,6 @@
         q-port-forwarding: true
 
 - job:
-    name: neutron-ovn-tempest-ovs-master
-    description: Job testing for devstack/tempest testing Neutron with ovn driver and OVN master branch
-    parent: neutron-ovn-base
-    vars:
-      devstack_localrc:
-        OVN_BRANCH: master
-
-- 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
     parent: devstack-tempest-ipv6
@@ -320,13 +286,3 @@
         OVN_BRANCH: v20.06.1
         # TODO(jlibosva): v2.13.0 is incompatible with kernel 4.15.0, sticking to commit hash until new v2.13 tag is created
         OVS_BRANCH: 51e9479da62edb04a5be47a7655de75c299b9fa1
-
-- 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-tempest-ovs-master
-    nodeset: devstack-single-node-fedora-latest
-    vars:
-      devstack_localrc:
-        OVN_BRANCH: master
-        OVS_BRANCH: master