From 21719a875d63adc9a823de7feacb119e5887f5af Mon Sep 17 00:00:00 2001
From: Bernard Cafarelli <bcafarel@redhat.com>
Date: Wed, 29 Jul 2020 18:01:52 +0200
Subject: [PATCH] [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: I2b1f4c4e951b691fb0c66119699b26540b0babd8
---
 zuul.d/project.yaml            |  5 ----
 zuul.d/tempest-multinode.yaml  | 46 ----------------------------------
 zuul.d/tempest-singlenode.yaml | 28 ---------------------
 3 files changed, 79 deletions(-)

diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 6f43a8a39ff..263106a8e38 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -75,8 +75,6 @@
             voting: false
         - neutron-ovn-tempest-slow:
             voting: false
-        - neutron-ovn-tempest-full-multinode-ovs-master:
-            voting: false
         - openstack-tox-py36:  # from openstack-python3-ussuri-jobs template
             timeout: 3600
         - openstack-tox-py37:  # from openstack-python3-ussuri-jobs template
@@ -112,7 +110,6 @@
 
     experimental:
       jobs:
-        - neutron-ovn-tempest-ovs-master
         - neutron-ovn-grenade
 
     periodic:
@@ -120,5 +117,3 @@
         - neutron-functional
         - 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 ac07b1658af..770513901df 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -200,49 +200,3 @@
       # be fixed
       tempest_black_regex: "\
           (^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 bbe8bbe83ba..3d020a3fb27 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -122,16 +122,6 @@
     pre-run: playbooks/add_mariadb_repo.yaml
     irrelevant-files: *irrelevant-files
 
-- job:
-    name: neutron-tempest-with-os-ken-master
-    parent: tempest-integrated-networking
-    timeout: 7800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/neutron
-      - openstack/tempest
-      - openstack/os-ken
-
 - job:
     name: neutron-tempest-with-uwsgi
     parent: tempest-integrated-networking
@@ -226,14 +216,6 @@
         tls-proxy: true
         q-qos: 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
@@ -262,13 +244,3 @@
         OVN_BRANCH: v20.03.0
         # 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