From 1d386c506f81d1d1ad06ee6989dd346502e9d401 Mon Sep 17 00:00:00 2001
From: Vladimir Kozhukalov <kozhukalov@gmail.com>
Date: Fri, 28 Feb 2025 18:28:29 -0600
Subject: [PATCH] Cleanup metallb feature gate

metallb isn't really a feature gate because
it is not related to any override. Instead we
used it only during ingress deployment to decide
whether we need to deploy cluster ingress instance.
Previously we moved ingress deployment to the deploy-env
role and cluster ingress instance is deployed
when metallb_setup job variable is set.

Change-Id: I22f6864e40f86527826a40379e516228f43896da
---
 zuul.d/2023.2.yaml | 1 -
 zuul.d/2024.1.yaml | 6 ------
 zuul.d/2024.2.yaml | 4 ----
 3 files changed, 11 deletions(-)

diff --git a/zuul.d/2023.2.yaml b/zuul.d/2023.2.yaml
index a6a9b0caa3..b1cfa0310e 100644
--- a/zuul.d/2023.2.yaml
+++ b/zuul.d/2023.2.yaml
@@ -62,7 +62,6 @@
         openstack_release: "2023.2"
         container_distro_name: ubuntu
         container_distro_version: jammy
-        feature_gates: metallb
 
 - job:
     name: openstack-helm-compute-kit-ovn-2023-2-ubuntu_jammy
diff --git a/zuul.d/2024.1.yaml b/zuul.d/2024.1.yaml
index ff6c7aa938..a321e02ef1 100644
--- a/zuul.d/2024.1.yaml
+++ b/zuul.d/2024.1.yaml
@@ -61,7 +61,6 @@
         openstack_release: "2024.1"
         container_distro_name: ubuntu
         container_distro_version: jammy
-        feature_gates: metallb
 
 - job:
     name: openstack-helm-compute-kit-metallb-2024-1-ubuntu_jammy
@@ -73,7 +72,6 @@
         openstack_release: "2024.1"
         container_distro_name: ubuntu
         container_distro_version: jammy
-        feature_gates: metallb
 
 - job:
     name: openstack-helm-compute-kit-kubespray-2024-1-ubuntu_jammy
@@ -85,7 +83,6 @@
         openstack_release: "2024.1"
         container_distro_name: ubuntu
         container_distro_version: jammy
-        feature_gates: metallb
 
 - job:
     name: openstack-helm-compute-kit-cilium-metallb-2024-1-ubuntu_jammy
@@ -99,7 +96,6 @@
         openstack_release: "2024.1"
         container_distro_name: ubuntu
         container_distro_version: jammy
-        feature_gates: metallb
 
 
 - job:
@@ -114,7 +110,6 @@
         openstack_release: "2024.1"
         container_distro_name: ubuntu
         container_distro_version: jammy
-        feature_gates: metallb
 
 - job:
     name: openstack-helm-compute-kit-helm-repo-public-2024-1-ubuntu_jammy
@@ -126,7 +121,6 @@
         openstack_release: "2024.1"
         container_distro_name: ubuntu
         container_distro_version: jammy
-        feature_gates: metallb
 
 - job:
     name: openstack-helm-compute-kit-ovn-2024-1-ubuntu_jammy
diff --git a/zuul.d/2024.2.yaml b/zuul.d/2024.2.yaml
index dd7a8b3597..db7e5ecc46 100644
--- a/zuul.d/2024.2.yaml
+++ b/zuul.d/2024.2.yaml
@@ -31,7 +31,6 @@
         openstack_release: "2024.2"
         container_distro_name: ubuntu
         container_distro_version: jammy
-        feature_gates: metallb
 
 - job:
     name: openstack-helm-compute-kit-cilium-metallb-2024-2-ubuntu_jammy
@@ -45,7 +44,6 @@
         openstack_release: "2024.2"
         container_distro_name: ubuntu
         container_distro_version: jammy
-        feature_gates: metallb
 
 - job:
     name: openstack-helm-compute-kit-flannel-metallb-2024-2-ubuntu_jammy
@@ -59,7 +57,6 @@
         openstack_release: "2024.2"
         container_distro_name: ubuntu
         container_distro_version: jammy
-        feature_gates: metallb
 
 - job:
     name: openstack-helm-compute-kit-helm-repo-public-2024-2-ubuntu_jammy
@@ -71,7 +68,6 @@
         openstack_release: "2024.2"
         container_distro_name: ubuntu
         container_distro_version: jammy
-        feature_gates: metallb
 
 - job:
     name: openstack-helm-compute-kit-ovn-2024-2-ubuntu_jammy