diff --git a/core-services/prow/02_config/openshift/operator-framework-olm/_prowconfig.yaml b/core-services/prow/02_config/openshift/operator-framework-olm/_prowconfig.yaml index d09025c18f15a..670237e7de16c 100644 --- a/core-services/prow/02_config/openshift/operator-framework-olm/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/operator-framework-olm/_prowconfig.yaml @@ -58,14 +58,14 @@ tide: repos: - openshift/operator-framework-olm - includedBranches: - - main - - master + - openshift-4.21 + - release-4.21 labels: - approved - - docs-approved + - backport-risk-assessed + - jira/valid-bug - jira/valid-reference - lgtm - - px-approved - verified missingLabels: - backports/unvalidated-commits @@ -73,19 +73,18 @@ tide: - do-not-merge/invalid-owners-file - do-not-merge/work-in-progress - jira/invalid-bug - - keep-main-query-separate - needs-rebase repos: - openshift/operator-framework-olm - includedBranches: - - openshift-4.22 - - release-4.22 + - main + - master labels: - approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm - - staff-eng-approved + - px-approved - verified missingLabels: - backports/unvalidated-commits @@ -93,6 +92,7 @@ tide: - do-not-merge/invalid-owners-file - do-not-merge/work-in-progress - jira/invalid-bug + - keep-main-query-separate - needs-rebase repos: - openshift/operator-framework-olm