revert acknowledge-critical-fixes-only label requirement post-branching (openshift#64521)

Author: smg247

core-services/prow/02_config/openshift-eng/ocp-build-data/_prowconfig.yaml

@@ -1,18 +1,5 @@
 tide:
   queries:
-  - includedBranches:
-    - openshift-4.19
-    labels:
-    - acknowledge-critical-fixes-only
-    - approved
-    - lgtm
-    missingLabels:
-    - do-not-merge/hold
-    - do-not-merge/invalid-owners-file
-    - do-not-merge/work-in-progress
-    - needs-rebase
-    repos:
-    - openshift-eng/ocp-build-data
   - includedBranches:
     - golang-1.10
     - golang-1.11
@@ -35,6 +22,7 @@ tide:
     - openshift-4.16
     - openshift-4.17
     - openshift-4.18
+    - openshift-4.19
     - openshift-4.20
     - openshift-4.7
     - openshift-4.8

core-services/prow/02_config/openshift/agent-installer-utils/_prowconfig.yaml

@@ -1,22 +1,5 @@
 tide:
   queries:
-  - includedBranches:
-    - main
-    labels:
-    - acknowledge-critical-fixes-only
-    - approved
-    - 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
-    - keep-main-query-separate
-    - needs-rebase
-    repos:
-    - openshift/agent-installer-utils
   - includedBranches:
     - community-4.6
     - community-4.7
@@ -90,6 +73,22 @@ tide:
     - needs-rebase
     repos:
     - openshift/agent-installer-utils
+  - includedBranches:
+    - main
+    labels:
+    - approved
+    - 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
+    - keep-main-query-separate
+    - needs-rebase
+    repos:
+    - openshift/agent-installer-utils
   - excludedBranches:
     - feature-es6x
     - feature-prom-connector

core-services/prow/02_config/openshift/api/_prowconfig.yaml

@@ -1,22 +1,5 @@
 tide:
   queries:
-  - includedBranches:
-    - main
-    - master
-    labels:
-    - acknowledge-critical-fixes-only
-    - approved
-    - lgtm
-    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/api
   - includedBranches:
     - community-4.6
     - community-4.7
@@ -88,6 +71,22 @@ tide:
     - needs-rebase
     repos:
     - openshift/api
+  - includedBranches:
+    - main
+    - master
+    labels:
+    - approved
+    - lgtm
+    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/api
   - excludedBranches:
     - feature-es6x
     - feature-prom-connector

core-services/prow/02_config/openshift/aws-ebs-csi-driver/_prowconfig.yaml

@@ -1,43 +1,5 @@
 tide:
   queries:
-  - includedBranches:
-    - main
-    - master
-    labels:
-    - acknowledge-critical-fixes-only
-    - 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
-    - keep-main-query-separate
-    - needs-rebase
-    repos:
-    - openshift/aws-ebs-csi-driver
-  - includedBranches:
-    - main
-    - master
-    labels:
-    - acknowledge-critical-fixes-only
-    - approved
-    - jira/valid-reference
-    - lgtm
-    - 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
-    - keep-main-query-separate
-    - needs-rebase
-    repos:
-    - openshift/aws-ebs-csi-driver
   - includedBranches:
     - community-4.6
     - community-4.7
@@ -111,6 +73,24 @@ tide:
     - needs-rebase
     repos:
     - openshift/aws-ebs-csi-driver
+  - includedBranches:
+    - main
+    - master
+    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
+    - keep-main-query-separate
+    - needs-rebase
+    repos:
+    - openshift/aws-ebs-csi-driver
   - excludedBranches:
     - feature-es6x
     - feature-prom-connector
@@ -170,6 +150,24 @@ tide:
     - needs-rebase
     repos:
     - openshift/aws-ebs-csi-driver
+  - includedBranches:
+    - main
+    - master
+    labels:
+    - approved
+    - jira/valid-reference
+    - lgtm
+    - 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
+    - keep-main-query-separate
+    - needs-rebase
+    repos:
+    - openshift/aws-ebs-csi-driver
   - excludedBranches:
     - feature-es6x
     - feature-prom-connector

core-services/prow/02_config/openshift/aws-encryption-provider/_prowconfig.yaml

@@ -1,24 +1,5 @@
 tide:
   queries:
-  - includedBranches:
-    - main
-    - master
-    labels:
-    - acknowledge-critical-fixes-only
-    - approved
-    - jira/valid-reference
-    - lgtm
-    - qe-approved,no-qe
-    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/aws-encryption-provider
   - includedBranches:
     - community-4.6
     - community-4.7
@@ -92,6 +73,24 @@ tide:
     - needs-rebase
     repos:
     - openshift/aws-encryption-provider
+  - includedBranches:
+    - main
+    - master
+    labels:
+    - approved
+    - jira/valid-reference
+    - lgtm
+    - qe-approved,no-qe
+    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/aws-encryption-provider
   - excludedBranches:
     - feature-es6x
     - feature-prom-connector

core-services/prow/02_config/openshift/aws-pod-identity-webhook/_prowconfig.yaml

@@ -1,44 +1,5 @@
 tide:
   queries:
-  - includedBranches:
-    - main
-    - master
-    labels:
-    - acknowledge-critical-fixes-only
-    - approved
-    - docs-approved
-    - jira/valid-reference
-    - 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
-    - keep-main-query-separate
-    - needs-rebase
-    repos:
-    - openshift/aws-pod-identity-webhook
-  - includedBranches:
-    - main
-    - master
-    labels:
-    - acknowledge-critical-fixes-only
-    - approved
-    - 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
-    - keep-main-query-separate
-    - needs-rebase
-    repos:
-    - openshift/aws-pod-identity-webhook
   - includedBranches:
     - community-4.6
     - community-4.7
@@ -112,6 +73,43 @@ tide:
     - needs-rebase
     repos:
     - openshift/aws-pod-identity-webhook
+  - includedBranches:
+    - main
+    - master
+    labels:
+    - approved
+    - docs-approved
+    - jira/valid-reference
+    - 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
+    - keep-main-query-separate
+    - needs-rebase
+    repos:
+    - openshift/aws-pod-identity-webhook
+  - includedBranches:
+    - main
+    - master
+    labels:
+    - approved
+    - 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
+    - keep-main-query-separate
+    - needs-rebase
+    repos:
+    - openshift/aws-pod-identity-webhook
   - excludedBranches:
     - feature-es6x
     - feature-prom-connector