From e602e422c6c277c550c36bc981b2bee404f8d7bd Mon Sep 17 00:00:00 2001 From: Chai Bot Date: Mon, 8 Jun 2026 16:02:18 +0000 Subject: [PATCH] NE-2494: Remove {docs,qe,px}-approved labels from NI&D repositories The no-FF (no-Feature-Freeze) process is no longer used by the Network Ingress & DNS team. Remove the {docs,qe,px}-approved labels from Tide merge queries for the team's repositories: - openshift/aws-load-balancer-operator - openshift/cluster-dns-operator - openshift/cluster-ingress-operator - openshift/coredns - openshift/external-dns-operator - openshift/route-controller-manager - openshift/router For repositories with dual main/master queries (one requiring the approval labels, one without), the approval-label query is removed entirely since it would be a duplicate of the remaining query after the label removal. For repositories with a single query containing these labels, the labels are removed from that query. https://redhat.atlassian.net/browse/NE-2494 Follow-up to 7dcfe394dd936594b873f4272ed5f7c865f76edb. Follow-up to f8ef768dc73d810436acb94b7138ec41d469aec4. Follow-up to 34b15abd9b23b4e768c881c43fc719d3ada4336c. Follow-up to 1559bb3b5f817752f05b1458e5e9052b8279a34b. Follow-up to 1047530658af64f74ef272cac38ef2e66c6b9b14. Follow-up to 5df39a4cf72b445a88c45d3706e6a90599139e39. --- .../_prowconfig.yaml | 15 ----- .../cluster-dns-operator/_prowconfig.yaml | 20 ------ .../cluster-ingress-operator/_prowconfig.yaml | 20 ------ .../openshift/coredns/_prowconfig.yaml | 20 ------ .../external-dns-operator/_prowconfig.yaml | 64 ------------------- .../route-controller-manager/_prowconfig.yaml | 25 +------- .../openshift/router/_prowconfig.yaml | 20 ------ 7 files changed, 1 insertion(+), 183 deletions(-) diff --git a/core-services/prow/02_config/openshift/aws-load-balancer-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/aws-load-balancer-operator/_prowconfig.yaml index 9827ff8068568..82a4482bb1282 100644 --- a/core-services/prow/02_config/openshift/aws-load-balancer-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/aws-load-balancer-operator/_prowconfig.yaml @@ -2,21 +2,6 @@ tide: merge_method: openshift/aws-load-balancer-operator: squash queries: - - labels: - - approved - - docs-approved - - lgtm - - px-approved - - qe-approved - missingLabels: - - backports/unvalidated-commits - - do-not-merge/hold - - do-not-merge/invalid-owners-file - - do-not-merge/work-in-progress - - jira/invalid-bug - - needs-rebase - repos: - - openshift/aws-load-balancer-operator - labels: - approved - jira/valid-bug diff --git a/core-services/prow/02_config/openshift/cluster-dns-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-dns-operator/_prowconfig.yaml index 281b7e54b7805..e77349699c622 100644 --- a/core-services/prow/02_config/openshift/cluster-dns-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-dns-operator/_prowconfig.yaml @@ -79,26 +79,6 @@ tide: - needs-rebase repos: - openshift/cluster-dns-operator - - includedBranches: - - main - - master - labels: - - approved - - docs-approved - - jira/valid-reference - - lgtm - - px-approved - - verified - missingLabels: - - backports/unvalidated-commits - - do-not-merge/hold - - do-not-merge/invalid-owners-file - - do-not-merge/work-in-progress - - jira/invalid-bug - - keep-main-query-separate - - needs-rebase - repos: - - openshift/cluster-dns-operator - includedBranches: - main - master diff --git a/core-services/prow/02_config/openshift/cluster-ingress-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-ingress-operator/_prowconfig.yaml index 50e0174cc2cd2..a8f1993e51883 100644 --- a/core-services/prow/02_config/openshift/cluster-ingress-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-ingress-operator/_prowconfig.yaml @@ -79,26 +79,6 @@ tide: - needs-rebase repos: - openshift/cluster-ingress-operator - - includedBranches: - - main - - master - labels: - - approved - - docs-approved - - jira/valid-reference - - lgtm - - px-approved - - verified - missingLabels: - - backports/unvalidated-commits - - do-not-merge/hold - - do-not-merge/invalid-owners-file - - do-not-merge/work-in-progress - - jira/invalid-bug - - keep-main-query-separate - - needs-rebase - repos: - - openshift/cluster-ingress-operator - includedBranches: - main - master diff --git a/core-services/prow/02_config/openshift/coredns/_prowconfig.yaml b/core-services/prow/02_config/openshift/coredns/_prowconfig.yaml index a626687b825f9..d81161d2c343c 100644 --- a/core-services/prow/02_config/openshift/coredns/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/coredns/_prowconfig.yaml @@ -79,26 +79,6 @@ tide: - needs-rebase repos: - openshift/coredns - - includedBranches: - - main - - master - labels: - - approved - - docs-approved - - jira/valid-reference - - lgtm - - px-approved - - verified - missingLabels: - - backports/unvalidated-commits - - do-not-merge/hold - - do-not-merge/invalid-owners-file - - do-not-merge/work-in-progress - - jira/invalid-bug - - keep-main-query-separate - - needs-rebase - repos: - - openshift/coredns - includedBranches: - main - master diff --git a/core-services/prow/02_config/openshift/external-dns-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/external-dns-operator/_prowconfig.yaml index 3947a2ba53904..2caced00b6318 100644 --- a/core-services/prow/02_config/openshift/external-dns-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/external-dns-operator/_prowconfig.yaml @@ -1,69 +1,5 @@ tide: queries: - - excludedBranches: - - feature-es6x - - feature-prom-connector - - openshift-4.1 - - openshift-4.10 - - openshift-4.11 - - openshift-4.12 - - openshift-4.13 - - openshift-4.14 - - openshift-4.15 - - openshift-4.16 - - openshift-4.17 - - openshift-4.18 - - openshift-4.19 - - openshift-4.2 - - openshift-4.20 - - openshift-4.21 - - openshift-4.22 - - openshift-4.3 - - openshift-4.4 - - openshift-4.5 - - openshift-4.6 - - openshift-4.7 - - openshift-4.8 - - openshift-4.9 - - release-3.11 - - release-4.0 - - release-4.1 - - release-4.10 - - release-4.11 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 - - release-4.16 - - release-4.17 - - release-4.18 - - release-4.19 - - release-4.2 - - release-4.20 - - release-4.21 - - release-4.22 - - release-4.3 - - release-4.4 - - release-4.5 - - release-4.6 - - release-4.7 - - release-4.8 - - release-4.9 - labels: - - approved - - docs-approved - - lgtm - - px-approved - - qe-approved - missingLabels: - - backports/unvalidated-commits - - do-not-merge/hold - - do-not-merge/invalid-owners-file - - do-not-merge/work-in-progress - - jira/invalid-bug - - needs-rebase - repos: - - openshift/external-dns-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/route-controller-manager/_prowconfig.yaml b/core-services/prow/02_config/openshift/route-controller-manager/_prowconfig.yaml index aa4d21e2ee128..50c9aee33d635 100644 --- a/core-services/prow/02_config/openshift/route-controller-manager/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/route-controller-manager/_prowconfig.yaml @@ -131,11 +131,9 @@ tide: - release-4.9 labels: - approved - - docs-approved + - jira/valid-bug - jira/valid-reference - lgtm - - px-approved - - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -150,10 +148,8 @@ tide: - master labels: - approved - - docs-approved - jira/valid-reference - lgtm - - px-approved - verified missingLabels: - backports/unvalidated-commits @@ -218,33 +214,14 @@ tide: - release-4.9 labels: - approved - - jira/valid-bug - - jira/valid-reference - - lgtm - missingLabels: - - backports/unvalidated-commits - - do-not-merge/hold - - do-not-merge/invalid-owners-file - - do-not-merge/work-in-progress - - jira/invalid-bug - - needs-rebase - repos: - - openshift/route-controller-manager - - includedBranches: - - main - - master - labels: - - approved - jira/valid-reference - lgtm - - verified missingLabels: - backports/unvalidated-commits - do-not-merge/hold - do-not-merge/invalid-owners-file - do-not-merge/work-in-progress - jira/invalid-bug - - keep-main-query-separate - needs-rebase repos: - openshift/route-controller-manager diff --git a/core-services/prow/02_config/openshift/router/_prowconfig.yaml b/core-services/prow/02_config/openshift/router/_prowconfig.yaml index b85dd046ca8a8..1933a350d41a8 100644 --- a/core-services/prow/02_config/openshift/router/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/router/_prowconfig.yaml @@ -78,26 +78,6 @@ tide: - needs-rebase repos: - openshift/router - - includedBranches: - - main - - master - labels: - - approved - - docs-approved - - jira/valid-reference - - lgtm - - px-approved - - verified - missingLabels: - - backports/unvalidated-commits - - do-not-merge/hold - - do-not-merge/invalid-owners-file - - do-not-merge/work-in-progress - - jira/invalid-bug - - keep-main-query-separate - - needs-rebase - repos: - - openshift/router - includedBranches: - main - master