Unblock console merge queue - Revert of openshift#39388

jhadvig · May 26, 2023 · 0bf4572 · 0bf4572
1 parent ac94dbb
commit 0bf4572
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/core-services/prow/02_config/_labels.yaml b/core-services/prow/02_config/_labels.yaml
@@ -613,11 +613,6 @@ repos:
         addedBy: prow
   openshift/console:
     labels:
-      - color: 15dd18
-        description: Issue related to major dependency update
-        name: dependency-update/major
-        target: prs
-        addedBy: approvers
       - color: 00D8FF
         description: Related to local-storage-operator-plugin
         name: component/lso

diff --git a/core-services/prow/02_config/openshift/console/_prowconfig.yaml b/core-services/prow/02_config/openshift/console/_prowconfig.yaml
@@ -49,7 +49,6 @@ tide:
     - master
     labels:
     - approved
-    - dependency-update/major
     - docs-approved
     - jira/valid-reference
     - lgtm
@@ -66,37 +65,36 @@ tide:
     repos:
     - openshift/console
   - includedBranches:
-    - main
-    - master
+    - openshift-4.14
+    - release-4.14
     labels:
     - approved
-    - dependency-update/major
     - jira/valid-bug
     - lgtm
+    - staff-eng-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/console
   - includedBranches:
-    - openshift-4.14
-    - release-4.14
+    - main
+    - master
     labels:
     - approved
     - jira/valid-bug
     - lgtm
-    - staff-eng-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/console