From 6aed6916a271acf5d986f136991e72d463b08272 Mon Sep 17 00:00:00 2001
From: Maysa Macedo <maysa.macedo95@gmail.com>
Date: Thu, 16 Jun 2022 13:40:46 +0200
Subject: [PATCH] Clean up unused and duplicated jobs

Change-Id: I2374bad29e19bf4a699b500c058b9f0bd4dc9217
---
 .zuul.d/base.yaml         |  6 +++---
 .zuul.d/project.yaml      |  1 -
 .zuul.d/tempest-jobs.yaml | 20 --------------------
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 68423709b..5e780793f 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -108,7 +108,6 @@
         - tag-ports-during-bulk-creation
       devstack_localrc:
         KURYR_NEUTRON_DEFAULT_ROUTER: kuryr-router
-        KURYR_ENFORCE_SG_RULES: false
         ML2_L3_PLUGIN: ovn-router,trunk,qos
         OVN_BRANCH: v21.06.0
         OVS_BRANCH: "a4b04276ab5934d087669ff2d191a23931335c87"
@@ -174,7 +173,7 @@
     name: kuryr-kubernetes-octavia-base
     parent: kuryr-kubernetes-base-ovn
     description: |
-      Kuryr-Kubernetes tempest job using octavia
+      Kuryr-Kubernetes tempest job using OVN and ovn-octavia driver for Kuryr
     required-projects:
       - openstack/octavia
       - openstack/python-octaviaclient
@@ -193,6 +192,7 @@
         - octavia-tempest-plugin
       devstack_localrc:
         KURYR_EP_DRIVER_OCTAVIA_PROVIDER: ovn
+        KURYR_ENFORCE_SG_RULES: false
         KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
         KURYR_LB_ALGORITHM: SOURCE_IP_PORT
         OCTAVIA_AMP_IMAGE_FILE: /tmp/test-only-amphora-x64-haproxy-ubuntu-focal.qcow2
@@ -222,7 +222,7 @@
     parent: kuryr-kubernetes-base-ovs
     nodeset: kuryr-nested-virt-ubuntu-focal
     description: |
-      Kuryr-Kubernetes tempest job using octavia
+      Kuryr-Kubernetes tempest job using OVS and amphora driver for Octavia
     required-projects:
       - openstack/octavia
       - openstack/python-octaviaclient
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index a2c51e303..f421f42d8 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -33,7 +33,6 @@
         - kuryr-kubernetes-tempest-systemd
     experimental:
       jobs:
-        - kuryr-kubernetes-tempest-l2
         - kuryr-kubernetes-tempest-pools-namespace
         - kuryr-kubernetes-tempest-multinode-ha
         - kuryr-kubernetes-tempest-dual-stack
diff --git a/.zuul.d/tempest-jobs.yaml b/.zuul.d/tempest-jobs.yaml
index fff47b9a1..11dc68a4b 100644
--- a/.zuul.d/tempest-jobs.yaml
+++ b/.zuul.d/tempest-jobs.yaml
@@ -152,26 +152,6 @@
         KURYR_DUAL_STACK: true
     voting: false
 
-- job:
-    name: kuryr-kubernetes-tempest-lower-constraints
-    parent: kuryr-kubernetes-octavia-base
-    description: |
-        Kuryr-Kubernetes tempest job running kuryr containerized with
-        requirments from lower-constraints.txt
-    vars:
-      devstack_localrc:
-        KURYR_CONTAINERS_USE_LOWER_CONSTRAINTS: true
-    voting: false
-
-- job:
-    name: kuryr-kubernetes-tempest-l2
-    parent: kuryr-kubernetes-octavia-base
-    description: |
-        Kuryr-Kubernetes tempest job using octavia in l2 mode, kuryr containerized
-    vars:
-      devstack_localrc:
-        KURYR_K8S_OCTAVIA_MEMBER_MODE: L2
-
 - job:
     name: kuryr-kubernetes-tempest-pools-namespace
     parent: kuryr-kubernetes-octavia-base