diff --git a/core-services/prow/02_config/openshift-eng/ocp-build-data/_prowconfig.yaml b/core-services/prow/02_config/openshift-eng/ocp-build-data/_prowconfig.yaml index 2f0ce7343e08f..24b66c9373e02 100644 --- a/core-services/prow/02_config/openshift-eng/ocp-build-data/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift-eng/ocp-build-data/_prowconfig.yaml @@ -44,7 +44,6 @@ tide: - rhel-9-golang-1.19 - rhel-9-golang-1.20 labels: - - acknowledge-critical-fixes-only - approved - lgtm missingLabels: diff --git a/core-services/prow/02_config/openshift/agent-installer-utils/_prowconfig.yaml b/core-services/prow/02_config/openshift/agent-installer-utils/_prowconfig.yaml index 6ce230cf6989f..7286747cf8588 100644 --- a/core-services/prow/02_config/openshift/agent-installer-utils/_prowconfig.yaml +++ b/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 @@ -83,6 +66,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 diff --git a/core-services/prow/02_config/openshift/api/_prowconfig.yaml b/core-services/prow/02_config/openshift/api/_prowconfig.yaml index a20eb285d5b58..4c0d7264294cc 100644 --- a/core-services/prow/02_config/openshift/api/_prowconfig.yaml +++ b/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 @@ -81,6 +64,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 diff --git a/core-services/prow/02_config/openshift/aws-ebs-csi-driver/_prowconfig.yaml b/core-services/prow/02_config/openshift/aws-ebs-csi-driver/_prowconfig.yaml index b8262b088aeb4..8f6ed5530c4d0 100644 --- a/core-services/prow/02_config/openshift/aws-ebs-csi-driver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/aws-ebs-csi-driver/_prowconfig.yaml @@ -1,45 +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-ebs-csi-driver - - 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: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/aws-ebs-csi-driver + - 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-ebs-csi-driver - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,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 diff --git a/core-services/prow/02_config/openshift/aws-pod-identity-webhook/_prowconfig.yaml b/core-services/prow/02_config/openshift/aws-pod-identity-webhook/_prowconfig.yaml index 6bbe3eec8d2dc..8da1d23ae86fc 100644 --- a/core-services/prow/02_config/openshift/aws-pod-identity-webhook/_prowconfig.yaml +++ b/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 @@ -87,6 +48,26 @@ 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: - openshift-4.16 - release-4.16 @@ -105,6 +86,23 @@ tide: - 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 diff --git a/core-services/prow/02_config/openshift/azure-disk-csi-driver/_prowconfig.yaml b/core-services/prow/02_config/openshift/azure-disk-csi-driver/_prowconfig.yaml index da320e8d6e7ef..8ade7317b6bce 100644 --- a/core-services/prow/02_config/openshift/azure-disk-csi-driver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/azure-disk-csi-driver/_prowconfig.yaml @@ -1,45 +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/azure-disk-csi-driver - - 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/azure-disk-csi-driver - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/azure-disk-csi-driver + - 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/azure-disk-csi-driver - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/azure-disk-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/azure-disk-csi-driver - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/azure-file-csi-driver/_prowconfig.yaml b/core-services/prow/02_config/openshift/azure-file-csi-driver/_prowconfig.yaml index 6d6ddbbbff5bf..aef92a0827337 100644 --- a/core-services/prow/02_config/openshift/azure-file-csi-driver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/azure-file-csi-driver/_prowconfig.yaml @@ -1,23 +1,33 @@ tide: queries: - includedBranches: - - main - - master + - openshift-4.10 + - openshift-4.11 + - openshift-4.12 + - openshift-4.13 + - openshift-4.14 + - openshift-4.15 + - openshift-4.9 + - release-4.10 + - release-4.11 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 + - release-4.9 labels: - - acknowledge-critical-fixes-only - approved - - docs-approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - 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/azure-file-csi-driver @@ -25,11 +35,12 @@ tide: - main - master labels: - - acknowledge-critical-fixes-only - approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -40,13 +51,18 @@ tide: - needs-rebase repos: - openshift/azure-file-csi-driver - - includedBranches: + - excludedBranches: + - feature-es6x + - feature-prom-connector + - main + - master - openshift-4.10 - openshift-4.11 - openshift-4.12 - openshift-4.13 - openshift-4.14 - openshift-4.15 + - openshift-4.16 - openshift-4.9 - release-4.10 - release-4.11 @@ -54,14 +70,15 @@ tide: - release-4.13 - release-4.14 - release-4.15 + - release-4.16 - release-4.9 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -71,34 +88,15 @@ tide: - needs-rebase repos: - openshift/azure-file-csi-driver - - excludedBranches: - - feature-es6x - - feature-prom-connector - - main - - master - - openshift-4.10 - - openshift-4.11 - - openshift-4.12 - - openshift-4.13 - - openshift-4.14 - - openshift-4.15 + - includedBranches: - openshift-4.16 - - openshift-4.9 - - release-4.10 - - release-4.11 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 - release-4.16 - - release-4.9 labels: - approved - - docs-approved + - jira/valid-bug - jira/valid-reference - lgtm - - px-approved - - qe-approved + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -109,20 +107,20 @@ tide: repos: - openshift/azure-file-csi-driver - includedBranches: - - openshift-4.16 - - release-4.16 + - main + - master labels: - approved - jira/valid-bug - jira/valid-reference - 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/azure-file-csi-driver diff --git a/core-services/prow/02_config/openshift/azure-workload-identity/_prowconfig.yaml b/core-services/prow/02_config/openshift/azure-workload-identity/_prowconfig.yaml index 38503b80c0a0f..20cd36ca10a88 100644 --- a/core-services/prow/02_config/openshift/azure-workload-identity/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/azure-workload-identity/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/azure-workload-identity - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/azure-workload-identity + - 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/azure-workload-identity - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/baremetal-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/baremetal-operator/_prowconfig.yaml index 2ebdc93aa7ada..2e022a39b3a61 100644 --- a/core-services/prow/02_config/openshift/baremetal-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/baremetal-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/baremetal-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/baremetal-operator + - 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/baremetal-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/baremetal-runtimecfg/_prowconfig.yaml b/core-services/prow/02_config/openshift/baremetal-runtimecfg/_prowconfig.yaml index 086b6cf1100e0..660295ce32d6c 100644 --- a/core-services/prow/02_config/openshift/baremetal-runtimecfg/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/baremetal-runtimecfg/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/baremetal-runtimecfg - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/baremetal-runtimecfg + - 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/baremetal-runtimecfg - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/bond-cni/_prowconfig.yaml b/core-services/prow/02_config/openshift/bond-cni/_prowconfig.yaml index 580ba6042b11a..bdeb32a9c98dd 100644 --- a/core-services/prow/02_config/openshift/bond-cni/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/bond-cni/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/bond-cni - excludedBranches: - openshift-4.1 - openshift-4.10 @@ -131,6 +113,23 @@ tide: - needs-rebase repos: - openshift/bond-cni + - 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/bond-cni - excludedBranches: - main - master diff --git a/core-services/prow/02_config/openshift/builder/_prowconfig.yaml b/core-services/prow/02_config/openshift/builder/_prowconfig.yaml index 163b8a902471b..9f48e0e5b7230 100644 --- a/core-services/prow/02_config/openshift/builder/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/builder/_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/builder - - 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/builder - includedBranches: - community-4.6 - community-4.7 @@ -87,6 +48,26 @@ tide: - needs-rebase repos: - openshift/builder + - 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/builder - excludedBranches: - feature-es6x - feature-prom-connector @@ -213,3 +194,20 @@ tide: - needs-rebase repos: - openshift/builder + - 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/builder diff --git a/core-services/prow/02_config/openshift/cloud-credential-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-credential-operator/_prowconfig.yaml index f4a4d9de69eea..04ace86489e38 100644 --- a/core-services/prow/02_config/openshift/cloud-credential-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-credential-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cloud-credential-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cloud-credential-operator + - 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/cloud-credential-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cloud-network-config-controller/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-network-config-controller/_prowconfig.yaml index 630471424bc14..c98ad440a70df 100644 --- a/core-services/prow/02_config/openshift/cloud-network-config-controller/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-network-config-controller/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cloud-network-config-controller - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cloud-network-config-controller + - 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/cloud-network-config-controller - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cloud-provider-alibaba-cloud/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-provider-alibaba-cloud/_prowconfig.yaml index 55816608377b7..e2c12a419ad5a 100644 --- a/core-services/prow/02_config/openshift/cloud-provider-alibaba-cloud/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-provider-alibaba-cloud/_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/cloud-provider-alibaba-cloud - includedBranches: - openshift-4.10 - openshift-4.11 @@ -66,6 +49,22 @@ tide: - needs-rebase repos: - openshift/cloud-provider-alibaba-cloud + - 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/cloud-provider-alibaba-cloud - excludedBranches: - main - openshift-4.10 diff --git a/core-services/prow/02_config/openshift/cloud-provider-aws/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-provider-aws/_prowconfig.yaml index b43dfca120e05..c29be8f82b667 100644 --- a/core-services/prow/02_config/openshift/cloud-provider-aws/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-provider-aws/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cloud-provider-aws - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cloud-provider-aws + - 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/cloud-provider-aws - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cloud-provider-azure/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-provider-azure/_prowconfig.yaml index bb9bff8b660ac..24d38e5f6f6eb 100644 --- a/core-services/prow/02_config/openshift/cloud-provider-azure/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-provider-azure/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cloud-provider-azure - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cloud-provider-azure + - 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/cloud-provider-azure - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cloud-provider-gcp/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-provider-gcp/_prowconfig.yaml index 3c699f1a2e595..ba981914b2f16 100644 --- a/core-services/prow/02_config/openshift/cloud-provider-gcp/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-provider-gcp/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cloud-provider-gcp - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cloud-provider-gcp + - 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/cloud-provider-gcp - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cloud-provider-ibm/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-provider-ibm/_prowconfig.yaml index 0f11766058dfe..4e5648ac1182a 100644 --- a/core-services/prow/02_config/openshift/cloud-provider-ibm/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-provider-ibm/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cloud-provider-ibm - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cloud-provider-ibm + - 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/cloud-provider-ibm - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cloud-provider-kubevirt/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-provider-kubevirt/_prowconfig.yaml index 2f399d27d3de9..1d238a5d817b6 100644 --- a/core-services/prow/02_config/openshift/cloud-provider-kubevirt/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-provider-kubevirt/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cloud-provider-kubevirt - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cloud-provider-kubevirt + - 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/cloud-provider-kubevirt - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cloud-provider-nutanix/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-provider-nutanix/_prowconfig.yaml index 87cbb24753f58..303b41704a054 100644 --- a/core-services/prow/02_config/openshift/cloud-provider-nutanix/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-provider-nutanix/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cloud-provider-nutanix - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cloud-provider-nutanix + - 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/cloud-provider-nutanix - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cloud-provider-openstack/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-provider-openstack/_prowconfig.yaml index 47a2994b29da3..0b1da245486fb 100644 --- a/core-services/prow/02_config/openshift/cloud-provider-openstack/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-provider-openstack/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cloud-provider-openstack - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cloud-provider-openstack + - 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/cloud-provider-openstack - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cloud-provider-powervs/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-provider-powervs/_prowconfig.yaml index 3b06da18f16fe..6990415f487ee 100644 --- a/core-services/prow/02_config/openshift/cloud-provider-powervs/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-provider-powervs/_prowconfig.yaml @@ -1,11 +1,21 @@ tide: queries: - includedBranches: - - main - - master + - openshift-4.11 + - openshift-4.12 + - openshift-4.13 + - openshift-4.14 + - openshift-4.15 + - release-4.11 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 labels: - - acknowledge-critical-fixes-only - approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - jira/valid-reference - lgtm missingLabels: @@ -14,19 +24,12 @@ tide: - do-not-merge/invalid-owners-file - do-not-merge/work-in-progress - jira/invalid-bug - - keep-main-query-separate - needs-rebase repos: - openshift/cloud-provider-powervs - includedBranches: - - openshift-4.11 - - openshift-4.12 - - openshift-4.13 - openshift-4.14 - openshift-4.15 - - release-4.11 - - release-4.12 - - release-4.13 - release-4.14 - release-4.15 labels: @@ -46,15 +49,10 @@ tide: repos: - openshift/cloud-provider-powervs - includedBranches: - - openshift-4.14 - - openshift-4.15 - - release-4.14 - - release-4.15 + - main + - master labels: - approved - - backport-risk-assessed - - cherry-pick-approved - - jira/valid-bug - jira/valid-reference - lgtm missingLabels: @@ -63,6 +61,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/cloud-provider-powervs diff --git a/core-services/prow/02_config/openshift/cloud-provider-vsphere/_prowconfig.yaml b/core-services/prow/02_config/openshift/cloud-provider-vsphere/_prowconfig.yaml index 506bd8ea4d5d1..36298e021db30 100644 --- a/core-services/prow/02_config/openshift/cloud-provider-vsphere/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-provider-vsphere/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cloud-provider-vsphere - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cloud-provider-vsphere + - 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/cloud-provider-vsphere - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-api-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-operator/_prowconfig.yaml index b36e3dc7d3272..b2343045ec13e 100644 --- a/core-services/prow/02_config/openshift/cluster-api-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api-operator/_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/cluster-api-operator - includedBranches: - openshift-4.10 - openshift-4.11 @@ -66,6 +49,22 @@ tide: - needs-rebase repos: - openshift/cluster-api-operator + - 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/cluster-api-operator - excludedBranches: - main - openshift-4.10 diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_prowconfig.yaml index e3966754b0d03..edb41b546f9d5 100644 --- a/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api-provider-alibaba/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-api-provider-alibaba - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-api-provider-alibaba + - 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/cluster-api-provider-alibaba - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-aws/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-aws/_prowconfig.yaml index 6f40e56ea01a0..6f3303302e856 100644 --- a/core-services/prow/02_config/openshift/cluster-api-provider-aws/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api-provider-aws/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-api-provider-aws - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-api-provider-aws + - 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/cluster-api-provider-aws - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-azure/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-azure/_prowconfig.yaml index dc53a38281a11..63d2f0a79abd6 100644 --- a/core-services/prow/02_config/openshift/cluster-api-provider-azure/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api-provider-azure/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-api-provider-azure - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-api-provider-azure + - 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/cluster-api-provider-azure - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-baremetal/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-baremetal/_prowconfig.yaml index 750b8a83c9d3c..f25e98951ca35 100644 --- a/core-services/prow/02_config/openshift/cluster-api-provider-baremetal/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api-provider-baremetal/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-api-provider-baremetal - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-api-provider-baremetal + - 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/cluster-api-provider-baremetal - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-gcp/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-gcp/_prowconfig.yaml index 3ff08f07cccb7..475e887a2e579 100644 --- a/core-services/prow/02_config/openshift/cluster-api-provider-gcp/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api-provider-gcp/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-api-provider-gcp - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-api-provider-gcp + - 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/cluster-api-provider-gcp - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-ibmcloud/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-ibmcloud/_prowconfig.yaml index 83a66f307f253..10fcaf928bdf4 100644 --- a/core-services/prow/02_config/openshift/cluster-api-provider-ibmcloud/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api-provider-ibmcloud/_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/cluster-api-provider-ibmcloud - includedBranches: - openshift-4.10 - openshift-4.11 @@ -66,6 +49,22 @@ tide: - needs-rebase repos: - openshift/cluster-api-provider-ibmcloud + - 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/cluster-api-provider-ibmcloud - excludedBranches: - main - openshift-4.10 diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-libvirt/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-libvirt/_prowconfig.yaml index 147c304f2ebb6..37fba6b3e6154 100644 --- a/core-services/prow/02_config/openshift/cluster-api-provider-libvirt/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api-provider-libvirt/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-api-provider-libvirt - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-api-provider-libvirt + - 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/cluster-api-provider-libvirt - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-openstack/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-openstack/_prowconfig.yaml index f3a822896492b..af4f04547f827 100644 --- a/core-services/prow/02_config/openshift/cluster-api-provider-openstack/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api-provider-openstack/_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/cluster-api-provider-openstack - includedBranches: - community-4.6 - community-4.7 @@ -81,6 +64,22 @@ tide: - needs-rebase repos: - openshift/cluster-api-provider-openstack + - 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/cluster-api-provider-openstack - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-ovirt/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-ovirt/_prowconfig.yaml index 130aa0f98b73d..96b98efbb8f24 100644 --- a/core-services/prow/02_config/openshift/cluster-api-provider-ovirt/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api-provider-ovirt/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-api-provider-ovirt - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-api-provider-ovirt + - 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/cluster-api-provider-ovirt - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-api-provider-vsphere/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api-provider-vsphere/_prowconfig.yaml index 9df48d48c190b..693c62b8a7711 100644 --- a/core-services/prow/02_config/openshift/cluster-api-provider-vsphere/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api-provider-vsphere/_prowconfig.yaml @@ -1,22 +1,5 @@ tide: queries: - - includedBranches: - - 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/cluster-api-provider-vsphere - includedBranches: - openshift-4.10 - openshift-4.11 @@ -66,6 +49,22 @@ tide: - needs-rebase repos: - openshift/cluster-api-provider-vsphere + - includedBranches: + - 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/cluster-api-provider-vsphere - excludedBranches: - master - openshift-4.10 diff --git a/core-services/prow/02_config/openshift/cluster-api/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-api/_prowconfig.yaml index 650e46f8d67d6..62045faca554a 100644 --- a/core-services/prow/02_config/openshift/cluster-api/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-api/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-api - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-api + - 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/cluster-api - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-authentication-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-authentication-operator/_prowconfig.yaml index 88fc0af984c16..8dfc87f89283c 100644 --- a/core-services/prow/02_config/openshift/cluster-authentication-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-authentication-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-authentication-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-authentication-operator + - 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/cluster-authentication-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-autoscaler-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-autoscaler-operator/_prowconfig.yaml index f9bb736ad906c..3d27810280153 100644 --- a/core-services/prow/02_config/openshift/cluster-autoscaler-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-autoscaler-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-autoscaler-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-autoscaler-operator + - 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/cluster-autoscaler-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-baremetal-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-baremetal-operator/_prowconfig.yaml index 7d1ad63109f76..f7066be5dfdf4 100644 --- a/core-services/prow/02_config/openshift/cluster-baremetal-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-baremetal-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-baremetal-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-baremetal-operator + - 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/cluster-baremetal-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-bootstrap/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-bootstrap/_prowconfig.yaml index 81362fe981bde..ad171408f2ad1 100644 --- a/core-services/prow/02_config/openshift/cluster-bootstrap/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-bootstrap/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-bootstrap - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-bootstrap + - 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/cluster-bootstrap - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-capi-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-capi-operator/_prowconfig.yaml index e5ea0f75b9ec7..2d39bef14f72d 100644 --- a/core-services/prow/02_config/openshift/cluster-capi-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-capi-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-capi-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-capi-operator + - 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/cluster-capi-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-cloud-controller-manager-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-cloud-controller-manager-operator/_prowconfig.yaml index 868fd350fc5fe..5e173cadb6136 100644 --- a/core-services/prow/02_config/openshift/cluster-cloud-controller-manager-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-cloud-controller-manager-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-cloud-controller-manager-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-cloud-controller-manager-operator + - 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/cluster-cloud-controller-manager-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-config-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-config-operator/_prowconfig.yaml index bb163e567d4cd..326d3584bc4b1 100644 --- a/core-services/prow/02_config/openshift/cluster-config-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-config-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-config-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-config-operator + - 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/cluster-config-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-control-plane-machine-set-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-control-plane-machine-set-operator/_prowconfig.yaml index 1b43bdc5642bf..052d2f255d7f1 100644 --- a/core-services/prow/02_config/openshift/cluster-control-plane-machine-set-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-control-plane-machine-set-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-control-plane-machine-set-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-control-plane-machine-set-operator + - 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/cluster-control-plane-machine-set-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-csi-snapshot-controller-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-csi-snapshot-controller-operator/_prowconfig.yaml index 142ed165d5feb..34ea5c507663d 100644 --- a/core-services/prow/02_config/openshift/cluster-csi-snapshot-controller-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-csi-snapshot-controller-operator/_prowconfig.yaml @@ -1,45 +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/cluster-csi-snapshot-controller-operator - - 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/cluster-csi-snapshot-controller-operator - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/cluster-csi-snapshot-controller-operator + - 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/cluster-csi-snapshot-controller-operator - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/cluster-csi-snapshot-controller-operator + - 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/cluster-csi-snapshot-controller-operator - excludedBranches: - feature-es6x - feature-prom-connector 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 adebafdecca37..5ac097e71343f 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 @@ -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/cluster-dns-operator - - 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/cluster-dns-operator - includedBranches: - community-4.6 - community-4.7 @@ -87,6 +48,26 @@ tide: - needs-rebase repos: - openshift/cluster-dns-operator + - 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/cluster-dns-operator - includedBranches: - openshift-4.16 - release-4.16 @@ -105,6 +86,23 @@ tide: - needs-rebase repos: - openshift/cluster-dns-operator + - 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/cluster-dns-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-etcd-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-etcd-operator/_prowconfig.yaml index 8f6a6489b46f8..e7c1d77ac7e7f 100644 --- a/core-services/prow/02_config/openshift/cluster-etcd-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-etcd-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-etcd-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-etcd-operator + - 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/cluster-etcd-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-image-registry-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-image-registry-operator/_prowconfig.yaml index 9ad447833baa0..09d6be6469c0b 100644 --- a/core-services/prow/02_config/openshift/cluster-image-registry-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-image-registry-operator/_prowconfig.yaml @@ -1,45 +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/cluster-image-registry-operator - - 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/cluster-image-registry-operator - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/cluster-image-registry-operator + - 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/cluster-image-registry-operator - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/cluster-image-registry-operator + - 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/cluster-image-registry-operator - excludedBranches: - feature-es6x - feature-prom-connector 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 6d3ffdfa6e08b..d40290819a2b9 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 @@ -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/cluster-ingress-operator - - 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/cluster-ingress-operator - includedBranches: - community-4.6 - community-4.7 @@ -87,6 +48,26 @@ tide: - needs-rebase repos: - openshift/cluster-ingress-operator + - 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/cluster-ingress-operator - includedBranches: - openshift-4.16 - release-4.16 @@ -105,6 +86,23 @@ tide: - needs-rebase repos: - openshift/cluster-ingress-operator + - 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/cluster-ingress-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-kube-apiserver-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-kube-apiserver-operator/_prowconfig.yaml index 2d5459d6a43ee..4b914c3405a52 100644 --- a/core-services/prow/02_config/openshift/cluster-kube-apiserver-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-kube-apiserver-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-kube-apiserver-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-kube-apiserver-operator + - 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/cluster-kube-apiserver-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-kube-controller-manager-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-kube-controller-manager-operator/_prowconfig.yaml index 7a57c5ebe595e..cd5e87d2b3ce9 100644 --- a/core-services/prow/02_config/openshift/cluster-kube-controller-manager-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-kube-controller-manager-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-kube-controller-manager-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-kube-controller-manager-operator + - 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/cluster-kube-controller-manager-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-kube-scheduler-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-kube-scheduler-operator/_prowconfig.yaml index 18aed71dbcb06..0d865a07c3b8a 100644 --- a/core-services/prow/02_config/openshift/cluster-kube-scheduler-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-kube-scheduler-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-kube-scheduler-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-kube-scheduler-operator + - 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/cluster-kube-scheduler-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-kube-storage-version-migrator-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-kube-storage-version-migrator-operator/_prowconfig.yaml index 48ebc86a2673b..b14aa93e391cb 100644 --- a/core-services/prow/02_config/openshift/cluster-kube-storage-version-migrator-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-kube-storage-version-migrator-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-kube-storage-version-migrator-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-kube-storage-version-migrator-operator + - 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/cluster-kube-storage-version-migrator-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-machine-approver/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-machine-approver/_prowconfig.yaml index e0aa129d443f9..e3c6ea8d3f58a 100644 --- a/core-services/prow/02_config/openshift/cluster-machine-approver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-machine-approver/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-machine-approver - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-machine-approver + - 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/cluster-machine-approver - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-monitoring-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-monitoring-operator/_prowconfig.yaml index 41d60213cba4e..9777f755931f2 100644 --- a/core-services/prow/02_config/openshift/cluster-monitoring-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-monitoring-operator/_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/cluster-monitoring-operator - - 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/cluster-monitoring-operator - includedBranches: - community-4.6 - community-4.7 @@ -87,6 +48,26 @@ tide: - needs-rebase repos: - openshift/cluster-monitoring-operator + - 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/cluster-monitoring-operator - includedBranches: - openshift-4.16 - release-4.16 @@ -105,6 +86,23 @@ tide: - needs-rebase repos: - openshift/cluster-monitoring-operator + - 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/cluster-monitoring-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-network-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-network-operator/_prowconfig.yaml index 9399ff744b2a5..ea8a192f57a23 100644 --- a/core-services/prow/02_config/openshift/cluster-network-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-network-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-network-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-network-operator + - 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/cluster-network-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-node-tuning-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-node-tuning-operator/_prowconfig.yaml index d3ddfa21f77ee..5d508d25c5bcf 100644 --- a/core-services/prow/02_config/openshift/cluster-node-tuning-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-node-tuning-operator/_prowconfig.yaml @@ -2,24 +2,6 @@ tide: merge_method: openshift/cluster-node-tuning-operator: squash queries: - - 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/cluster-node-tuning-operator - includedBranches: - community-4.6 - community-4.7 @@ -86,6 +68,23 @@ tide: - needs-rebase repos: - openshift/cluster-node-tuning-operator + - 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/cluster-node-tuning-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-olm-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-olm-operator/_prowconfig.yaml index c878ace964e0b..2fb5f62b252db 100644 --- a/core-services/prow/02_config/openshift/cluster-olm-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-olm-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-olm-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-olm-operator + - 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/cluster-olm-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-openshift-apiserver-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-openshift-apiserver-operator/_prowconfig.yaml index 33b4519c0e58c..847350c138a5e 100644 --- a/core-services/prow/02_config/openshift/cluster-openshift-apiserver-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-openshift-apiserver-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-openshift-apiserver-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-openshift-apiserver-operator + - 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/cluster-openshift-apiserver-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-openshift-controller-manager-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-openshift-controller-manager-operator/_prowconfig.yaml index 6d700b58cdfcb..37fb9f744d1d5 100644 --- a/core-services/prow/02_config/openshift/cluster-openshift-controller-manager-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-openshift-controller-manager-operator/_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/cluster-openshift-controller-manager-operator - - 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/cluster-openshift-controller-manager-operator - includedBranches: - community-4.6 - community-4.7 @@ -87,6 +48,26 @@ tide: - needs-rebase repos: - openshift/cluster-openshift-controller-manager-operator + - 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/cluster-openshift-controller-manager-operator - excludedBranches: - feature-es6x - feature-prom-connector @@ -213,3 +194,20 @@ tide: - needs-rebase repos: - openshift/cluster-openshift-controller-manager-operator + - 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/cluster-openshift-controller-manager-operator diff --git a/core-services/prow/02_config/openshift/cluster-policy-controller/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-policy-controller/_prowconfig.yaml index 7e30492132b3a..59ef153d9ebd7 100644 --- a/core-services/prow/02_config/openshift/cluster-policy-controller/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-policy-controller/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-policy-controller - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-policy-controller + - 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/cluster-policy-controller - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-samples-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-samples-operator/_prowconfig.yaml index 9a68497ebde33..51ee10b7d7fd0 100644 --- a/core-services/prow/02_config/openshift/cluster-samples-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-samples-operator/_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/cluster-samples-operator - - 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/cluster-samples-operator - includedBranches: - community-4.6 - community-4.7 @@ -87,6 +48,26 @@ tide: - needs-rebase repos: - openshift/cluster-samples-operator + - 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/cluster-samples-operator - includedBranches: - openshift-4.16 - release-4.16 @@ -105,6 +86,23 @@ tide: - needs-rebase repos: - openshift/cluster-samples-operator + - 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/cluster-samples-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-storage-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-storage-operator/_prowconfig.yaml index 538a4b8a2e8f2..0794555e9d015 100644 --- a/core-services/prow/02_config/openshift/cluster-storage-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-storage-operator/_prowconfig.yaml @@ -1,45 +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/cluster-storage-operator - - 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/cluster-storage-operator - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/cluster-storage-operator + - 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/cluster-storage-operator - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/cluster-storage-operator + - 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/cluster-storage-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-update-keys/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-update-keys/_prowconfig.yaml index 0631783a4db49..82241ad53c7d4 100644 --- a/core-services/prow/02_config/openshift/cluster-update-keys/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-update-keys/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/cluster-update-keys - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/cluster-update-keys + - 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/cluster-update-keys - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/cluster-version-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/cluster-version-operator/_prowconfig.yaml index cf308a2736d08..707c504f6916a 100644 --- a/core-services/prow/02_config/openshift/cluster-version-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-version-operator/_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/cluster-version-operator - includedBranches: - community-4.6 - community-4.7 @@ -85,6 +66,24 @@ tide: - needs-rebase repos: - openshift/cluster-version-operator + - 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/cluster-version-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/configmap-reload/_prowconfig.yaml b/core-services/prow/02_config/openshift/configmap-reload/_prowconfig.yaml index 2f9f0c7e797ad..434def4dc6c79 100644 --- a/core-services/prow/02_config/openshift/configmap-reload/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/configmap-reload/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/configmap-reload - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/configmap-reload + - 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/configmap-reload - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/console-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/console-operator/_prowconfig.yaml index c631cd22250ff..2bd79520f537f 100644 --- a/core-services/prow/02_config/openshift/console-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/console-operator/_prowconfig.yaml @@ -1,45 +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/console-operator - - 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/console-operator - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/console-operator + - 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/console-operator - includedBranches: - openshift-4.16 - release-4.16 @@ -106,6 +86,24 @@ tide: - needs-rebase repos: - openshift/console-operator + - 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/console-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/console/_prowconfig.yaml b/core-services/prow/02_config/openshift/console/_prowconfig.yaml index 5cc7f4e737a68..eb137c8ecc04e 100644 --- a/core-services/prow/02_config/openshift/console/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/console/_prowconfig.yaml @@ -1,45 +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/console - - 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/console - includedBranches: - community-4.6 - community-4.7 @@ -89,6 +49,26 @@ tide: - needs-rebase repos: - openshift/console + - 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/console - includedBranches: - openshift-4.16 - release-4.16 @@ -107,6 +87,24 @@ tide: - needs-rebase repos: - openshift/console + - 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/console - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/containernetworking-plugins/_prowconfig.yaml b/core-services/prow/02_config/openshift/containernetworking-plugins/_prowconfig.yaml index 1eb9ce19b0b3e..7fb929b78b542 100644 --- a/core-services/prow/02_config/openshift/containernetworking-plugins/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/containernetworking-plugins/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/containernetworking-plugins - includedBranches: - openshift-4.10 - openshift-4.11 @@ -82,6 +64,23 @@ tide: - needs-rebase repos: - openshift/containernetworking-plugins + - 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/containernetworking-plugins - excludedBranches: - 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 831e1a604a78d..7fcdee65ebd44 100644 --- a/core-services/prow/02_config/openshift/coredns/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/coredns/_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/coredns - - 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/coredns - includedBranches: - community-4.6 - community-4.7 @@ -87,6 +48,26 @@ tide: - needs-rebase repos: - openshift/coredns + - 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/coredns - includedBranches: - openshift-4.16 - release-4.16 @@ -105,6 +86,23 @@ tide: - needs-rebase repos: - openshift/coredns + - 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/coredns - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/csi-driver-manila-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/csi-driver-manila-operator/_prowconfig.yaml index 05e45ccd06b36..606549e7022d5 100644 --- a/core-services/prow/02_config/openshift/csi-driver-manila-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/csi-driver-manila-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/csi-driver-manila-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/csi-driver-manila-operator + - 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/csi-driver-manila-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/csi-driver-nfs/_prowconfig.yaml b/core-services/prow/02_config/openshift/csi-driver-nfs/_prowconfig.yaml index 0902aa7db84bc..29ba8b370b2f5 100644 --- a/core-services/prow/02_config/openshift/csi-driver-nfs/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/csi-driver-nfs/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/csi-driver-nfs - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/csi-driver-nfs + - 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/csi-driver-nfs - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/csi-driver-shared-resource-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/csi-driver-shared-resource-operator/_prowconfig.yaml index 1361176736eb6..adf6d7e750d4e 100644 --- a/core-services/prow/02_config/openshift/csi-driver-shared-resource-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/csi-driver-shared-resource-operator/_prowconfig.yaml @@ -1,45 +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/csi-driver-shared-resource-operator - - 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/csi-driver-shared-resource-operator - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/csi-driver-shared-resource-operator + - 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/csi-driver-shared-resource-operator - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/csi-driver-shared-resource-operator + - 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/csi-driver-shared-resource-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/csi-driver-shared-resource/_prowconfig.yaml b/core-services/prow/02_config/openshift/csi-driver-shared-resource/_prowconfig.yaml index 2262cf3702ed2..82feb35353390 100644 --- a/core-services/prow/02_config/openshift/csi-driver-shared-resource/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/csi-driver-shared-resource/_prowconfig.yaml @@ -1,45 +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/csi-driver-shared-resource - - 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/csi-driver-shared-resource - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/csi-driver-shared-resource + - 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/csi-driver-shared-resource - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/csi-driver-shared-resource + - 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/csi-driver-shared-resource - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/csi-external-attacher/_prowconfig.yaml b/core-services/prow/02_config/openshift/csi-external-attacher/_prowconfig.yaml index d924a61e1ddce..c448bc7d36c1a 100644 --- a/core-services/prow/02_config/openshift/csi-external-attacher/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/csi-external-attacher/_prowconfig.yaml @@ -1,45 +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/csi-external-attacher - - 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/csi-external-attacher - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/csi-external-attacher + - 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/csi-external-attacher - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/csi-external-attacher + - 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/csi-external-attacher - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/csi-external-provisioner/_prowconfig.yaml b/core-services/prow/02_config/openshift/csi-external-provisioner/_prowconfig.yaml index 282663be4132d..10b54a4118fe3 100644 --- a/core-services/prow/02_config/openshift/csi-external-provisioner/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/csi-external-provisioner/_prowconfig.yaml @@ -1,45 +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/csi-external-provisioner - - 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/csi-external-provisioner - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/csi-external-provisioner + - 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/csi-external-provisioner - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/csi-external-provisioner + - 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/csi-external-provisioner - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/csi-external-resizer/_prowconfig.yaml b/core-services/prow/02_config/openshift/csi-external-resizer/_prowconfig.yaml index 175b085687bee..f80f23bb11263 100644 --- a/core-services/prow/02_config/openshift/csi-external-resizer/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/csi-external-resizer/_prowconfig.yaml @@ -1,45 +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/csi-external-resizer - - 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/csi-external-resizer - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/csi-external-resizer + - 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/csi-external-resizer - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/csi-external-resizer + - 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/csi-external-resizer - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/csi-external-snapshotter/_prowconfig.yaml b/core-services/prow/02_config/openshift/csi-external-snapshotter/_prowconfig.yaml index bc10445a5d4c4..5d7d83ea4e2a1 100644 --- a/core-services/prow/02_config/openshift/csi-external-snapshotter/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/csi-external-snapshotter/_prowconfig.yaml @@ -1,45 +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/csi-external-snapshotter - - 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/csi-external-snapshotter - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/csi-external-snapshotter + - 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/csi-external-snapshotter - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/csi-external-snapshotter + - 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/csi-external-snapshotter - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/csi-livenessprobe/_prowconfig.yaml b/core-services/prow/02_config/openshift/csi-livenessprobe/_prowconfig.yaml index bc4c29a1c63c6..d7decbdee7773 100644 --- a/core-services/prow/02_config/openshift/csi-livenessprobe/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/csi-livenessprobe/_prowconfig.yaml @@ -1,45 +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/csi-livenessprobe - - 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/csi-livenessprobe - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/csi-livenessprobe + - 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/csi-livenessprobe - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/csi-livenessprobe + - 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/csi-livenessprobe - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/csi-node-driver-registrar/_prowconfig.yaml b/core-services/prow/02_config/openshift/csi-node-driver-registrar/_prowconfig.yaml index 3e9f580a70525..c60ad4b01fb38 100644 --- a/core-services/prow/02_config/openshift/csi-node-driver-registrar/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/csi-node-driver-registrar/_prowconfig.yaml @@ -1,45 +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/csi-node-driver-registrar - - 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/csi-node-driver-registrar - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/csi-node-driver-registrar + - 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/csi-node-driver-registrar - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/csi-node-driver-registrar + - 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/csi-node-driver-registrar - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/csi-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/csi-operator/_prowconfig.yaml index 44aef4076b6e6..1968f69094e38 100644 --- a/core-services/prow/02_config/openshift/csi-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/csi-operator/_prowconfig.yaml @@ -1,45 +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/csi-operator - - 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/csi-operator - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/csi-operator + - 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/csi-operator - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/csi-operator + - 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/csi-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/driver-toolkit/_prowconfig.yaml b/core-services/prow/02_config/openshift/driver-toolkit/_prowconfig.yaml index 2df13e072fc76..d164edf1112d0 100644 --- a/core-services/prow/02_config/openshift/driver-toolkit/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/driver-toolkit/_prowconfig.yaml @@ -2,24 +2,6 @@ tide: merge_method: openshift/driver-toolkit: squash queries: - - 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/driver-toolkit - includedBranches: - community-4.6 - community-4.7 @@ -86,6 +68,23 @@ tide: - needs-rebase repos: - openshift/driver-toolkit + - 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/driver-toolkit - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/egress-router-cni/_prowconfig.yaml b/core-services/prow/02_config/openshift/egress-router-cni/_prowconfig.yaml index fc6bc93eef2e7..fe9f4c4a892de 100644 --- a/core-services/prow/02_config/openshift/egress-router-cni/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/egress-router-cni/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/egress-router-cni - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/egress-router-cni + - 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/egress-router-cni - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/gcp-pd-csi-driver-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/gcp-pd-csi-driver-operator/_prowconfig.yaml index b390014fddd71..a7439b1bc21e8 100644 --- a/core-services/prow/02_config/openshift/gcp-pd-csi-driver-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/gcp-pd-csi-driver-operator/_prowconfig.yaml @@ -1,23 +1,34 @@ tide: queries: - includedBranches: - - main - - master + - release-4.0 + - release-4.10 + - release-4.11 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 + - release-4.2 + - release-4.3 + - release-4.4 + - release-4.5 + - release-4.6 + - release-4.7 + - release-4.8 + - release-4.9 labels: - - acknowledge-critical-fixes-only - approved - - docs-approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - 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/gcp-pd-csi-driver-operator @@ -25,11 +36,12 @@ tide: - main - master labels: - - acknowledge-critical-fixes-only - approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -40,14 +52,18 @@ tide: - needs-rebase repos: - openshift/gcp-pd-csi-driver-operator - - includedBranches: + - excludedBranches: + - main + - master - 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.2 - release-4.3 - release-4.4 @@ -58,11 +74,11 @@ tide: - release-4.9 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -72,33 +88,15 @@ tide: - needs-rebase repos: - openshift/gcp-pd-csi-driver-operator - - excludedBranches: - - main - - master - - release-4.0 - - release-4.1 - - release-4.10 - - release-4.11 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 + - includedBranches: + - openshift-4.16 - release-4.16 - - release-4.2 - - 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 + - jira/valid-bug - jira/valid-reference - lgtm - - px-approved - - qe-approved + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -109,20 +107,20 @@ tide: repos: - openshift/gcp-pd-csi-driver-operator - includedBranches: - - openshift-4.16 - - release-4.16 + - main + - master labels: - approved - jira/valid-bug - jira/valid-reference - 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/gcp-pd-csi-driver-operator diff --git a/core-services/prow/02_config/openshift/gcp-pd-csi-driver/_prowconfig.yaml b/core-services/prow/02_config/openshift/gcp-pd-csi-driver/_prowconfig.yaml index cda9e391e2cbe..5c1982aefa6e7 100644 --- a/core-services/prow/02_config/openshift/gcp-pd-csi-driver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/gcp-pd-csi-driver/_prowconfig.yaml @@ -1,23 +1,34 @@ tide: queries: - includedBranches: - - main - - master + - release-4.0 + - release-4.10 + - release-4.11 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 + - release-4.2 + - release-4.3 + - release-4.4 + - release-4.5 + - release-4.6 + - release-4.7 + - release-4.8 + - release-4.9 labels: - - acknowledge-critical-fixes-only - approved - - docs-approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - 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/gcp-pd-csi-driver @@ -25,11 +36,12 @@ tide: - main - master labels: - - acknowledge-critical-fixes-only - approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -40,14 +52,18 @@ tide: - needs-rebase repos: - openshift/gcp-pd-csi-driver - - includedBranches: + - excludedBranches: + - main + - master - 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.2 - release-4.3 - release-4.4 @@ -58,11 +74,11 @@ tide: - release-4.9 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -72,33 +88,15 @@ tide: - needs-rebase repos: - openshift/gcp-pd-csi-driver - - excludedBranches: - - main - - master - - release-4.0 - - release-4.1 - - release-4.10 - - release-4.11 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 + - includedBranches: + - openshift-4.16 - release-4.16 - - release-4.2 - - 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 + - jira/valid-bug - jira/valid-reference - lgtm - - px-approved - - qe-approved + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -109,20 +107,20 @@ tide: repos: - openshift/gcp-pd-csi-driver - includedBranches: - - openshift-4.16 - - release-4.16 + - main + - master labels: - approved - jira/valid-bug - jira/valid-reference - 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/gcp-pd-csi-driver diff --git a/core-services/prow/02_config/openshift/ibm-powervs-block-csi-driver-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/ibm-powervs-block-csi-driver-operator/_prowconfig.yaml index 3c884c3689083..ba838ad4bd8f2 100644 --- a/core-services/prow/02_config/openshift/ibm-powervs-block-csi-driver-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/ibm-powervs-block-csi-driver-operator/_prowconfig.yaml @@ -1,11 +1,18 @@ tide: queries: - includedBranches: - - main - - master + - openshift-4.12 + - openshift-4.13 + - openshift-4.14 + - openshift-4.15 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 labels: - - acknowledge-critical-fixes-only - approved + - backport-risk-assessed + - cherry-pick-approved - jira/valid-bug - jira/valid-reference - lgtm @@ -15,41 +22,32 @@ tide: - do-not-merge/invalid-owners-file - do-not-merge/work-in-progress - jira/invalid-bug - - keep-main-query-separate - needs-rebase repos: - openshift/ibm-powervs-block-csi-driver-operator - includedBranches: - - main - - master + - openshift-4.16 + - release-4.16 labels: - - acknowledge-critical-fixes-only - approved + - jira/valid-bug - jira/valid-reference - 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/ibm-powervs-block-csi-driver-operator - includedBranches: - - openshift-4.12 - - openshift-4.13 - - openshift-4.14 - - openshift-4.15 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 + - main + - master labels: - approved - - backport-risk-assessed - - cherry-pick-approved - jira/valid-bug - jira/valid-reference - lgtm @@ -59,18 +57,28 @@ tide: - do-not-merge/invalid-owners-file - do-not-merge/work-in-progress - jira/invalid-bug + - keep-main-query-separate - needs-rebase repos: - openshift/ibm-powervs-block-csi-driver-operator - - includedBranches: + - excludedBranches: + - main + - master + - openshift-4.12 + - openshift-4.13 + - openshift-4.14 + - openshift-4.15 - openshift-4.16 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 - release-4.16 labels: - approved - jira/valid-bug - jira/valid-reference - lgtm - - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -80,22 +88,11 @@ tide: - needs-rebase repos: - openshift/ibm-powervs-block-csi-driver-operator - - excludedBranches: + - includedBranches: - main - master - - openshift-4.12 - - openshift-4.13 - - openshift-4.14 - - openshift-4.15 - - openshift-4.16 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 - - release-4.16 labels: - approved - - jira/valid-bug - jira/valid-reference - lgtm missingLabels: @@ -104,6 +101,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/ibm-powervs-block-csi-driver-operator diff --git a/core-services/prow/02_config/openshift/ibm-powervs-block-csi-driver/_prowconfig.yaml b/core-services/prow/02_config/openshift/ibm-powervs-block-csi-driver/_prowconfig.yaml index ce5c4ab06835b..a80f8b7281bb1 100644 --- a/core-services/prow/02_config/openshift/ibm-powervs-block-csi-driver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/ibm-powervs-block-csi-driver/_prowconfig.yaml @@ -1,11 +1,18 @@ tide: queries: - includedBranches: - - main - - master + - openshift-4.12 + - openshift-4.13 + - openshift-4.14 + - openshift-4.15 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 labels: - - acknowledge-critical-fixes-only - approved + - backport-risk-assessed + - cherry-pick-approved - jira/valid-bug - jira/valid-reference - lgtm @@ -15,41 +22,32 @@ tide: - do-not-merge/invalid-owners-file - do-not-merge/work-in-progress - jira/invalid-bug - - keep-main-query-separate - needs-rebase repos: - openshift/ibm-powervs-block-csi-driver - includedBranches: - - main - - master + - openshift-4.16 + - release-4.16 labels: - - acknowledge-critical-fixes-only - approved + - jira/valid-bug - jira/valid-reference - 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/ibm-powervs-block-csi-driver - includedBranches: - - openshift-4.12 - - openshift-4.13 - - openshift-4.14 - - openshift-4.15 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 + - main + - master labels: - approved - - backport-risk-assessed - - cherry-pick-approved - jira/valid-bug - jira/valid-reference - lgtm @@ -59,18 +57,28 @@ tide: - do-not-merge/invalid-owners-file - do-not-merge/work-in-progress - jira/invalid-bug + - keep-main-query-separate - needs-rebase repos: - openshift/ibm-powervs-block-csi-driver - - includedBranches: + - excludedBranches: + - main + - master + - openshift-4.12 + - openshift-4.13 + - openshift-4.14 + - openshift-4.15 - openshift-4.16 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 - release-4.16 labels: - approved - jira/valid-bug - jira/valid-reference - lgtm - - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -80,22 +88,11 @@ tide: - needs-rebase repos: - openshift/ibm-powervs-block-csi-driver - - excludedBranches: + - includedBranches: - main - master - - openshift-4.12 - - openshift-4.13 - - openshift-4.14 - - openshift-4.15 - - openshift-4.16 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 - - release-4.16 labels: - approved - - jira/valid-bug - jira/valid-reference - lgtm missingLabels: @@ -104,6 +101,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/ibm-powervs-block-csi-driver diff --git a/core-services/prow/02_config/openshift/ibm-vpc-block-csi-driver-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/ibm-vpc-block-csi-driver-operator/_prowconfig.yaml index bd593c08209ef..61e0d0f456d81 100644 --- a/core-services/prow/02_config/openshift/ibm-vpc-block-csi-driver-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/ibm-vpc-block-csi-driver-operator/_prowconfig.yaml @@ -1,23 +1,33 @@ tide: queries: - includedBranches: - - main - - master + - openshift-4.10 + - openshift-4.11 + - openshift-4.12 + - openshift-4.13 + - openshift-4.14 + - openshift-4.15 + - openshift-4.9 + - release-4.10 + - release-4.11 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 + - release-4.9 labels: - - acknowledge-critical-fixes-only - approved - - docs-approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - 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/ibm-vpc-block-csi-driver-operator @@ -25,11 +35,12 @@ tide: - main - master labels: - - acknowledge-critical-fixes-only - approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -40,13 +51,16 @@ tide: - needs-rebase repos: - openshift/ibm-vpc-block-csi-driver-operator - - includedBranches: + - excludedBranches: + - main + - master - openshift-4.10 - openshift-4.11 - openshift-4.12 - openshift-4.13 - openshift-4.14 - openshift-4.15 + - openshift-4.16 - openshift-4.9 - release-4.10 - release-4.11 @@ -54,14 +68,15 @@ tide: - release-4.13 - release-4.14 - release-4.15 + - release-4.16 - release-4.9 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -71,32 +86,15 @@ tide: - needs-rebase repos: - openshift/ibm-vpc-block-csi-driver-operator - - excludedBranches: - - main - - master - - openshift-4.10 - - openshift-4.11 - - openshift-4.12 - - openshift-4.13 - - openshift-4.14 - - openshift-4.15 + - includedBranches: - openshift-4.16 - - openshift-4.9 - - release-4.10 - - release-4.11 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 - release-4.16 - - release-4.9 labels: - approved - - docs-approved + - jira/valid-bug - jira/valid-reference - lgtm - - px-approved - - qe-approved + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -107,20 +105,20 @@ tide: repos: - openshift/ibm-vpc-block-csi-driver-operator - includedBranches: - - openshift-4.16 - - release-4.16 + - main + - master labels: - approved - jira/valid-bug - jira/valid-reference - 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/ibm-vpc-block-csi-driver-operator diff --git a/core-services/prow/02_config/openshift/ibm-vpc-block-csi-driver/_prowconfig.yaml b/core-services/prow/02_config/openshift/ibm-vpc-block-csi-driver/_prowconfig.yaml index 9ece149859bb9..e582a91a6c594 100644 --- a/core-services/prow/02_config/openshift/ibm-vpc-block-csi-driver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/ibm-vpc-block-csi-driver/_prowconfig.yaml @@ -1,23 +1,33 @@ tide: queries: - includedBranches: - - main - - master + - openshift-4.10 + - openshift-4.11 + - openshift-4.12 + - openshift-4.13 + - openshift-4.14 + - openshift-4.15 + - openshift-4.9 + - release-4.10 + - release-4.11 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 + - release-4.9 labels: - - acknowledge-critical-fixes-only - approved - - docs-approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - 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/ibm-vpc-block-csi-driver @@ -25,11 +35,12 @@ tide: - main - master labels: - - acknowledge-critical-fixes-only - approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -40,13 +51,16 @@ tide: - needs-rebase repos: - openshift/ibm-vpc-block-csi-driver - - includedBranches: + - excludedBranches: + - main + - master - openshift-4.10 - openshift-4.11 - openshift-4.12 - openshift-4.13 - openshift-4.14 - openshift-4.15 + - openshift-4.16 - openshift-4.9 - release-4.10 - release-4.11 @@ -54,14 +68,15 @@ tide: - release-4.13 - release-4.14 - release-4.15 + - release-4.16 - release-4.9 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -71,32 +86,15 @@ tide: - needs-rebase repos: - openshift/ibm-vpc-block-csi-driver - - excludedBranches: - - main - - master - - openshift-4.10 - - openshift-4.11 - - openshift-4.12 - - openshift-4.13 - - openshift-4.14 - - openshift-4.15 + - includedBranches: - openshift-4.16 - - openshift-4.9 - - release-4.10 - - release-4.11 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 - release-4.16 - - release-4.9 labels: - approved - - docs-approved + - jira/valid-bug - jira/valid-reference - lgtm - - px-approved - - qe-approved + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -107,20 +105,20 @@ tide: repos: - openshift/ibm-vpc-block-csi-driver - includedBranches: - - openshift-4.16 - - release-4.16 + - main + - master labels: - approved - jira/valid-bug - jira/valid-reference - 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/ibm-vpc-block-csi-driver diff --git a/core-services/prow/02_config/openshift/image-customization-controller/_prowconfig.yaml b/core-services/prow/02_config/openshift/image-customization-controller/_prowconfig.yaml index 03b85dd023a5c..15f94c9a190ee 100644 --- a/core-services/prow/02_config/openshift/image-customization-controller/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/image-customization-controller/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/image-customization-controller - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/image-customization-controller + - 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/image-customization-controller - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/image-registry/_prowconfig.yaml b/core-services/prow/02_config/openshift/image-registry/_prowconfig.yaml index 36f19c29c2e03..4f2a0c2cbedfb 100644 --- a/core-services/prow/02_config/openshift/image-registry/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/image-registry/_prowconfig.yaml @@ -1,45 +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/image-registry - - 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/image-registry - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/image-registry + - 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/image-registry - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/image-registry + - 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/image-registry - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/images/_prowconfig.yaml b/core-services/prow/02_config/openshift/images/_prowconfig.yaml index c08aa8533957e..79fe5522142c0 100644 --- a/core-services/prow/02_config/openshift/images/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/images/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/images - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/images + - 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/images - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/insights-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/insights-operator/_prowconfig.yaml index 03ed166461c2b..c8a13619849a1 100644 --- a/core-services/prow/02_config/openshift/insights-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/insights-operator/_prowconfig.yaml @@ -2,44 +2,6 @@ tide: merge_method: openshift/insights-operator: squash 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/insights-operator - - 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/insights-operator - includedBranches: - community-4.6 - community-4.7 @@ -106,6 +68,42 @@ tide: - needs-rebase repos: - openshift/insights-operator + - 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/insights-operator + - 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/insights-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/installer/_prowconfig.yaml b/core-services/prow/02_config/openshift/installer/_prowconfig.yaml index 816db5ba38673..7305407f0d107 100644 --- a/core-services/prow/02_config/openshift/installer/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/installer/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/installer - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/installer + - 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/installer - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/ironic-agent-image/_prowconfig.yaml b/core-services/prow/02_config/openshift/ironic-agent-image/_prowconfig.yaml index 26c6afc36330b..fa535612c210e 100644 --- a/core-services/prow/02_config/openshift/ironic-agent-image/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/ironic-agent-image/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/ironic-agent-image - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/ironic-agent-image + - 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/ironic-agent-image - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/ironic-image/_prowconfig.yaml b/core-services/prow/02_config/openshift/ironic-image/_prowconfig.yaml index 75314db0ccd20..0b4d6a2fca629 100644 --- a/core-services/prow/02_config/openshift/ironic-image/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/ironic-image/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/ironic-image - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/ironic-image + - 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/ironic-image - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/ironic-rhcos-downloader/_prowconfig.yaml b/core-services/prow/02_config/openshift/ironic-rhcos-downloader/_prowconfig.yaml index 9969d1fce8183..f789f836ab32a 100644 --- a/core-services/prow/02_config/openshift/ironic-rhcos-downloader/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/ironic-rhcos-downloader/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/ironic-rhcos-downloader - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/ironic-rhcos-downloader + - 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/ironic-rhcos-downloader - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/ironic-static-ip-manager/_prowconfig.yaml b/core-services/prow/02_config/openshift/ironic-static-ip-manager/_prowconfig.yaml index 3ff1a9bcdbf5b..671df27e1f964 100644 --- a/core-services/prow/02_config/openshift/ironic-static-ip-manager/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/ironic-static-ip-manager/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/ironic-static-ip-manager - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/ironic-static-ip-manager + - 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/ironic-static-ip-manager - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/k8s-prometheus-adapter/_prowconfig.yaml b/core-services/prow/02_config/openshift/k8s-prometheus-adapter/_prowconfig.yaml index 6454750b4c593..509dee2967b99 100644 --- a/core-services/prow/02_config/openshift/k8s-prometheus-adapter/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/k8s-prometheus-adapter/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/k8s-prometheus-adapter - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/k8s-prometheus-adapter + - 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/k8s-prometheus-adapter - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/kube-rbac-proxy/_prowconfig.yaml b/core-services/prow/02_config/openshift/kube-rbac-proxy/_prowconfig.yaml index 71fbb33926118..a1162f9f879bc 100644 --- a/core-services/prow/02_config/openshift/kube-rbac-proxy/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/kube-rbac-proxy/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/kube-rbac-proxy - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/kube-rbac-proxy + - 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/kube-rbac-proxy - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/kube-state-metrics/_prowconfig.yaml b/core-services/prow/02_config/openshift/kube-state-metrics/_prowconfig.yaml index ce5569f4b9a08..a34ce7e042582 100644 --- a/core-services/prow/02_config/openshift/kube-state-metrics/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/kube-state-metrics/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/kube-state-metrics - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/kube-state-metrics + - 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/kube-state-metrics - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/kubernetes-autoscaler/_prowconfig.yaml b/core-services/prow/02_config/openshift/kubernetes-autoscaler/_prowconfig.yaml index a8a816ae5e580..d514979e9a971 100644 --- a/core-services/prow/02_config/openshift/kubernetes-autoscaler/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/kubernetes-autoscaler/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/kubernetes-autoscaler - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/kubernetes-autoscaler + - 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/kubernetes-autoscaler - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/kubernetes-kube-storage-version-migrator/_prowconfig.yaml b/core-services/prow/02_config/openshift/kubernetes-kube-storage-version-migrator/_prowconfig.yaml index 0d9b69554153a..b7e9bd882c654 100644 --- a/core-services/prow/02_config/openshift/kubernetes-kube-storage-version-migrator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/kubernetes-kube-storage-version-migrator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/kubernetes-kube-storage-version-migrator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/kubernetes-kube-storage-version-migrator + - 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/kubernetes-kube-storage-version-migrator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/kubernetes-metrics-server/_prowconfig.yaml b/core-services/prow/02_config/openshift/kubernetes-metrics-server/_prowconfig.yaml index 4a5c971237fe7..8cd5eb7947e58 100644 --- a/core-services/prow/02_config/openshift/kubernetes-metrics-server/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/kubernetes-metrics-server/_prowconfig.yaml @@ -4,7 +4,6 @@ tide: - main - master labels: - - acknowledge-critical-fixes-only - approved - docs-approved - lgtm diff --git a/core-services/prow/02_config/openshift/kubernetes/_prowconfig.yaml b/core-services/prow/02_config/openshift/kubernetes/_prowconfig.yaml index b8907aa40f931..1eebface06f6c 100644 --- a/core-services/prow/02_config/openshift/kubernetes/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/kubernetes/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/kubernetes - includedBranches: - community-4.6 - community-4.7 @@ -84,3 +66,20 @@ tide: - needs-rebase repos: - openshift/kubernetes + - 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/kubernetes diff --git a/core-services/prow/02_config/openshift/kubevirt-csi-driver/_prowconfig.yaml b/core-services/prow/02_config/openshift/kubevirt-csi-driver/_prowconfig.yaml index f22a38cd7f3b1..0e38960ce58a7 100644 --- a/core-services/prow/02_config/openshift/kubevirt-csi-driver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/kubevirt-csi-driver/_prowconfig.yaml @@ -9,24 +9,6 @@ branch-protection: protect: false tide: queries: - - 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/kubevirt-csi-driver - includedBranches: - community-4.6 - community-4.7 @@ -93,6 +75,23 @@ tide: - needs-rebase repos: - openshift/kubevirt-csi-driver + - 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/kubevirt-csi-driver - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/machine-api-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/machine-api-operator/_prowconfig.yaml index 369b7f250492a..5e18d8b1ab65d 100644 --- a/core-services/prow/02_config/openshift/machine-api-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/machine-api-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/machine-api-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/machine-api-operator + - 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/machine-api-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/machine-api-provider-aws/_prowconfig.yaml b/core-services/prow/02_config/openshift/machine-api-provider-aws/_prowconfig.yaml index e64781bf277cd..36862260eff10 100644 --- a/core-services/prow/02_config/openshift/machine-api-provider-aws/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/machine-api-provider-aws/_prowconfig.yaml @@ -1,11 +1,17 @@ tide: queries: - includedBranches: - - main - - master + - release-4.10 + - release-4.11 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 labels: - - acknowledge-critical-fixes-only - approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - jira/valid-reference - lgtm missingLabels: @@ -14,24 +20,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/machine-api-provider-aws - includedBranches: - - release-4.10 - - release-4.11 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 + - openshift-4.16 + - release-4.16 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - jira/valid-bug - jira/valid-reference - lgtm + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -42,20 +42,19 @@ tide: repos: - openshift/machine-api-provider-aws - includedBranches: - - openshift-4.16 - - release-4.16 + - main + - master labels: - approved - - jira/valid-bug - jira/valid-reference - 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/machine-api-provider-aws diff --git a/core-services/prow/02_config/openshift/machine-api-provider-azure/_prowconfig.yaml b/core-services/prow/02_config/openshift/machine-api-provider-azure/_prowconfig.yaml index 62b41b708cd0f..db67ad07efcec 100644 --- a/core-services/prow/02_config/openshift/machine-api-provider-azure/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/machine-api-provider-azure/_prowconfig.yaml @@ -1,11 +1,17 @@ tide: queries: - includedBranches: - - main - - master + - release-4.10 + - release-4.11 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 labels: - - acknowledge-critical-fixes-only - approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - jira/valid-reference - lgtm missingLabels: @@ -14,24 +20,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/machine-api-provider-azure - includedBranches: - - release-4.10 - - release-4.11 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 + - openshift-4.16 + - release-4.16 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - jira/valid-bug - jira/valid-reference - lgtm + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -42,20 +42,19 @@ tide: repos: - openshift/machine-api-provider-azure - includedBranches: - - openshift-4.16 - - release-4.16 + - main + - master labels: - approved - - jira/valid-bug - jira/valid-reference - 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/machine-api-provider-azure diff --git a/core-services/prow/02_config/openshift/machine-api-provider-gcp/_prowconfig.yaml b/core-services/prow/02_config/openshift/machine-api-provider-gcp/_prowconfig.yaml index 411e99f5fe46e..903c946f86d47 100644 --- a/core-services/prow/02_config/openshift/machine-api-provider-gcp/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/machine-api-provider-gcp/_prowconfig.yaml @@ -1,11 +1,17 @@ tide: queries: - includedBranches: - - main - - master + - release-4.10 + - release-4.11 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 labels: - - acknowledge-critical-fixes-only - approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - jira/valid-reference - lgtm missingLabels: @@ -14,24 +20,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/machine-api-provider-gcp - includedBranches: - - release-4.10 - - release-4.11 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 + - openshift-4.16 + - release-4.16 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - jira/valid-bug - jira/valid-reference - lgtm + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -42,20 +42,19 @@ tide: repos: - openshift/machine-api-provider-gcp - includedBranches: - - openshift-4.16 - - release-4.16 + - main + - master labels: - approved - - jira/valid-bug - jira/valid-reference - 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/machine-api-provider-gcp diff --git a/core-services/prow/02_config/openshift/machine-api-provider-nutanix/_prowconfig.yaml b/core-services/prow/02_config/openshift/machine-api-provider-nutanix/_prowconfig.yaml index e922313a540b0..07db914b2b5b7 100644 --- a/core-services/prow/02_config/openshift/machine-api-provider-nutanix/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/machine-api-provider-nutanix/_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/machine-api-provider-nutanix - includedBranches: - openshift-4.10 - openshift-4.11 @@ -64,6 +47,22 @@ tide: - needs-rebase repos: - openshift/machine-api-provider-nutanix + - 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/machine-api-provider-nutanix - excludedBranches: - main - openshift-4.10 diff --git a/core-services/prow/02_config/openshift/machine-api-provider-openstack/_prowconfig.yaml b/core-services/prow/02_config/openshift/machine-api-provider-openstack/_prowconfig.yaml index 8562f8b8ed474..a4b6eff616bb7 100644 --- a/core-services/prow/02_config/openshift/machine-api-provider-openstack/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/machine-api-provider-openstack/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/machine-api-provider-openstack - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/machine-api-provider-openstack + - 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/machine-api-provider-openstack - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/machine-api-provider-powervs/_prowconfig.yaml b/core-services/prow/02_config/openshift/machine-api-provider-powervs/_prowconfig.yaml index e16e194c18941..37128da6c8d9c 100644 --- a/core-services/prow/02_config/openshift/machine-api-provider-powervs/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/machine-api-provider-powervs/_prowconfig.yaml @@ -1,11 +1,17 @@ tide: queries: - includedBranches: - - main - - master + - release-4.10 + - release-4.11 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 labels: - - acknowledge-critical-fixes-only - approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - jira/valid-reference - lgtm missingLabels: @@ -14,24 +20,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/machine-api-provider-powervs - includedBranches: - - release-4.10 - - release-4.11 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 + - openshift-4.16 + - release-4.16 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - jira/valid-bug - jira/valid-reference - lgtm + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -42,20 +42,19 @@ tide: repos: - openshift/machine-api-provider-powervs - includedBranches: - - openshift-4.16 - - release-4.16 + - main + - master labels: - approved - - jira/valid-bug - jira/valid-reference - 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/machine-api-provider-powervs diff --git a/core-services/prow/02_config/openshift/machine-config-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/machine-config-operator/_prowconfig.yaml index 785111e7e1eda..b63aa9ff5be9c 100644 --- a/core-services/prow/02_config/openshift/machine-config-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/machine-config-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/machine-config-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/machine-config-operator + - 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/machine-config-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/machine-os-images/_prowconfig.yaml b/core-services/prow/02_config/openshift/machine-os-images/_prowconfig.yaml index 3c8f8bbcf90f9..ca27999937bec 100644 --- a/core-services/prow/02_config/openshift/machine-os-images/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/machine-os-images/_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/machine-os-images - includedBranches: - openshift-4.10 - openshift-4.11 @@ -64,6 +47,22 @@ tide: - needs-rebase repos: - openshift/machine-os-images + - 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/machine-os-images - excludedBranches: - main - openshift-4.10 diff --git a/core-services/prow/02_config/openshift/multus-admission-controller/_prowconfig.yaml b/core-services/prow/02_config/openshift/multus-admission-controller/_prowconfig.yaml index 33f1f29b8d916..152c665dcfb34 100644 --- a/core-services/prow/02_config/openshift/multus-admission-controller/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/multus-admission-controller/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/multus-admission-controller - includedBranches: - openshift-4.10 - openshift-4.11 @@ -82,6 +64,23 @@ tide: - needs-rebase repos: - openshift/multus-admission-controller + - 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/multus-admission-controller - excludedBranches: - main - master diff --git a/core-services/prow/02_config/openshift/multus-cni/_prowconfig.yaml b/core-services/prow/02_config/openshift/multus-cni/_prowconfig.yaml index 84aea3705fb53..2f6023a55552e 100644 --- a/core-services/prow/02_config/openshift/multus-cni/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/multus-cni/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/multus-cni - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/multus-cni + - 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/multus-cni - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/multus-networkpolicy/_prowconfig.yaml b/core-services/prow/02_config/openshift/multus-networkpolicy/_prowconfig.yaml index 9506d5db9dab3..932df48aee559 100644 --- a/core-services/prow/02_config/openshift/multus-networkpolicy/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/multus-networkpolicy/_prowconfig.yaml @@ -2,24 +2,6 @@ tide: merge_method: openshift/multus-networkpolicy: squash queries: - - 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/multus-networkpolicy - includedBranches: - openshift-4.10 - openshift-4.11 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/multus-networkpolicy + - 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/multus-networkpolicy - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/must-gather/_prowconfig.yaml b/core-services/prow/02_config/openshift/must-gather/_prowconfig.yaml index ee02f8818689f..3e9b8c3c0640b 100644 --- a/core-services/prow/02_config/openshift/must-gather/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/must-gather/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/must-gather - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/must-gather + - 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/must-gather - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/network-tools/_prowconfig.yaml b/core-services/prow/02_config/openshift/network-tools/_prowconfig.yaml index 9ee8d57b55b2e..8276af0d5a5ce 100644 --- a/core-services/prow/02_config/openshift/network-tools/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/network-tools/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/network-tools - includedBranches: - release-4.0 - release-4.10 @@ -67,6 +49,23 @@ tide: - needs-rebase repos: - openshift/network-tools + - 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/network-tools - excludedBranches: - release-4.0 - release-4.1 diff --git a/core-services/prow/02_config/openshift/node_exporter/_prowconfig.yaml b/core-services/prow/02_config/openshift/node_exporter/_prowconfig.yaml index bcd735dcbf7c1..1bf1b5bd9f852 100644 --- a/core-services/prow/02_config/openshift/node_exporter/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/node_exporter/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/node_exporter - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/node_exporter + - 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/node_exporter - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/oauth-apiserver/_prowconfig.yaml b/core-services/prow/02_config/openshift/oauth-apiserver/_prowconfig.yaml index 0c4b089014b15..743f4f38437f9 100644 --- a/core-services/prow/02_config/openshift/oauth-apiserver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/oauth-apiserver/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/oauth-apiserver - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/oauth-apiserver + - 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/oauth-apiserver - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/oauth-proxy/_prowconfig.yaml b/core-services/prow/02_config/openshift/oauth-proxy/_prowconfig.yaml index 50e60346ad46a..1a82aa8e13900 100644 --- a/core-services/prow/02_config/openshift/oauth-proxy/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/oauth-proxy/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/oauth-proxy - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/oauth-proxy + - 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/oauth-proxy - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/oauth-server/_prowconfig.yaml b/core-services/prow/02_config/openshift/oauth-server/_prowconfig.yaml index cae472facb149..5c3cb264aae18 100644 --- a/core-services/prow/02_config/openshift/oauth-server/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/oauth-server/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/oauth-server - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/oauth-server + - 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/oauth-server - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/oc-mirror/_prowconfig.yaml b/core-services/prow/02_config/openshift/oc-mirror/_prowconfig.yaml index 6d1f92ef9c61d..29f24d1793737 100644 --- a/core-services/prow/02_config/openshift/oc-mirror/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/oc-mirror/_prowconfig.yaml @@ -2,24 +2,6 @@ tide: merge_method: openshift/oc-mirror: squash queries: - - 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/oc-mirror - includedBranches: - community-4.6 - community-4.7 @@ -86,6 +68,23 @@ tide: - needs-rebase repos: - openshift/oc-mirror + - 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/oc-mirror - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/oc/_prowconfig.yaml b/core-services/prow/02_config/openshift/oc/_prowconfig.yaml index eceafcce6c99d..b33fd29287a25 100644 --- a/core-services/prow/02_config/openshift/oc/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/oc/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/oc - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/oc + - 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/oc - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/openshift-apiserver/_prowconfig.yaml b/core-services/prow/02_config/openshift/openshift-apiserver/_prowconfig.yaml index 75c97ecc14f5d..7afacf7a11fc7 100644 --- a/core-services/prow/02_config/openshift/openshift-apiserver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/openshift-apiserver/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/openshift-apiserver - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/openshift-apiserver + - 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/openshift-apiserver - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/openshift-controller-manager/_prowconfig.yaml b/core-services/prow/02_config/openshift/openshift-controller-manager/_prowconfig.yaml index 575b4e867f714..cd4b9cf496060 100644 --- a/core-services/prow/02_config/openshift/openshift-controller-manager/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/openshift-controller-manager/_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/openshift-controller-manager - - 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/openshift-controller-manager - includedBranches: - community-4.6 - community-4.7 @@ -87,6 +48,26 @@ tide: - needs-rebase repos: - openshift/openshift-controller-manager + - 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/openshift-controller-manager - excludedBranches: - feature-es6x - feature-prom-connector @@ -213,3 +194,20 @@ tide: - needs-rebase repos: - openshift/openshift-controller-manager + - 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/openshift-controller-manager diff --git a/core-services/prow/02_config/openshift/openshift-state-metrics/_prowconfig.yaml b/core-services/prow/02_config/openshift/openshift-state-metrics/_prowconfig.yaml index 806d564716781..554921b514c47 100644 --- a/core-services/prow/02_config/openshift/openshift-state-metrics/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/openshift-state-metrics/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/openshift-state-metrics - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/openshift-state-metrics + - 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/openshift-state-metrics - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/openstack-cinder-csi-driver-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/openstack-cinder-csi-driver-operator/_prowconfig.yaml index 4aa5670e24aa4..90a6a0677f712 100644 --- a/core-services/prow/02_config/openshift/openstack-cinder-csi-driver-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/openstack-cinder-csi-driver-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/openstack-cinder-csi-driver-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/openstack-cinder-csi-driver-operator + - 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/openstack-cinder-csi-driver-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/operator-framework-catalogd/_prowconfig.yaml b/core-services/prow/02_config/openshift/operator-framework-catalogd/_prowconfig.yaml index addcf886ba76b..e9619789567c3 100644 --- a/core-services/prow/02_config/openshift/operator-framework-catalogd/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/operator-framework-catalogd/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/operator-framework-catalogd - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/operator-framework-catalogd + - 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/operator-framework-catalogd - excludedBranches: - feature-es6x - feature-prom-connector 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 a3cd1412b4711..ddc434917adec 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 @@ -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/operator-framework-olm - - 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/operator-framework-olm - includedBranches: - community-4.6 - community-4.7 @@ -87,6 +48,26 @@ tide: - needs-rebase repos: - openshift/operator-framework-olm + - 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/operator-framework-olm - includedBranches: - openshift-4.16 - release-4.16 @@ -105,6 +86,23 @@ tide: - needs-rebase repos: - openshift/operator-framework-olm + - 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/operator-framework-olm - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/operator-framework-operator-controller/_prowconfig.yaml b/core-services/prow/02_config/openshift/operator-framework-operator-controller/_prowconfig.yaml index cd724b777e079..5c78dbc28b500 100644 --- a/core-services/prow/02_config/openshift/operator-framework-operator-controller/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/operator-framework-operator-controller/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/operator-framework-operator-controller - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/operator-framework-operator-controller + - 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/operator-framework-operator-controller - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/operator-framework-rukpak/_prowconfig.yaml b/core-services/prow/02_config/openshift/operator-framework-rukpak/_prowconfig.yaml index c9301851e7a33..74c7943f59641 100644 --- a/core-services/prow/02_config/openshift/operator-framework-rukpak/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/operator-framework-rukpak/_prowconfig.yaml @@ -1,53 +1,53 @@ tide: queries: - includedBranches: - - main + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 labels: - - acknowledge-critical-fixes-only - approved - - docs-approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - 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/operator-framework-rukpak - includedBranches: - main 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/operator-framework-rukpak - includedBranches: - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 + - release-4.16 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - jira/valid-bug - jira/valid-reference - lgtm + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -57,14 +57,17 @@ tide: - needs-rebase repos: - openshift/operator-framework-rukpak - - includedBranches: + - excludedBranches: + - main + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 - release-4.16 labels: - approved - - jira/valid-bug - jira/valid-reference - lgtm - - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -74,13 +77,8 @@ tide: - needs-rebase repos: - openshift/operator-framework-rukpak - - excludedBranches: + - includedBranches: - main - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 - - release-4.16 labels: - approved - jira/valid-reference diff --git a/core-services/prow/02_config/openshift/origin/_prowconfig.yaml b/core-services/prow/02_config/openshift/origin/_prowconfig.yaml index 099165bd2a4f5..1f7e35417153a 100644 --- a/core-services/prow/02_config/openshift/origin/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/origin/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/origin - includedBranches: - community-4.6 - community-4.7 @@ -100,6 +82,23 @@ tide: - needs-rebase repos: - openshift/origin + - 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/origin - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/os/_prowconfig.yaml b/core-services/prow/02_config/openshift/os/_prowconfig.yaml index 9ac98c5933c5b..0809c5ff0d33a 100644 --- a/core-services/prow/02_config/openshift/os/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/os/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/os - includedBranches: - release-4.10 - release-4.11 @@ -61,6 +43,23 @@ tide: - needs-rebase repos: - openshift/os + - 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/os - excludedBranches: - main - master diff --git a/core-services/prow/02_config/openshift/ovirt-csi-driver-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/ovirt-csi-driver-operator/_prowconfig.yaml index 70e68320dda5f..5a8820aa1dc48 100644 --- a/core-services/prow/02_config/openshift/ovirt-csi-driver-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/ovirt-csi-driver-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/ovirt-csi-driver-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/ovirt-csi-driver-operator + - 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/ovirt-csi-driver-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/ovirt-csi-driver/_prowconfig.yaml b/core-services/prow/02_config/openshift/ovirt-csi-driver/_prowconfig.yaml index ae3b16bf03e45..532acdaa0e325 100644 --- a/core-services/prow/02_config/openshift/ovirt-csi-driver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/ovirt-csi-driver/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/ovirt-csi-driver - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/ovirt-csi-driver + - 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/ovirt-csi-driver - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/ovn-kubernetes/_prowconfig.yaml b/core-services/prow/02_config/openshift/ovn-kubernetes/_prowconfig.yaml index ada44792a68e8..6e4900df966ae 100644 --- a/core-services/prow/02_config/openshift/ovn-kubernetes/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/ovn-kubernetes/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/ovn-kubernetes - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/ovn-kubernetes + - 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/ovn-kubernetes - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/platform-operators/_prowconfig.yaml b/core-services/prow/02_config/openshift/platform-operators/_prowconfig.yaml index a6bd8fee49315..bff9742cf4595 100644 --- a/core-services/prow/02_config/openshift/platform-operators/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/platform-operators/_prowconfig.yaml @@ -1,16 +1,17 @@ tide: queries: - includedBranches: - - main - - master + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 labels: - - acknowledge-critical-fixes-only - approved - - docs-approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - jira/valid-reference - lgtm - - px-approved - - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -24,10 +25,12 @@ tide: - 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 @@ -38,17 +41,13 @@ tide: repos: - openshift/platform-operators - includedBranches: - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 + - release-4.16 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - jira/valid-bug - jira/valid-reference - lgtm + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -58,14 +57,18 @@ tide: - needs-rebase repos: - openshift/platform-operators - - includedBranches: + - excludedBranches: + - main + - master + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 - release-4.16 labels: - approved - - jira/valid-bug - jira/valid-reference - lgtm - - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -75,14 +78,9 @@ tide: - needs-rebase repos: - openshift/platform-operators - - excludedBranches: + - includedBranches: - main - master - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 - - release-4.16 labels: - approved - jira/valid-reference diff --git a/core-services/prow/02_config/openshift/prom-label-proxy/_prowconfig.yaml b/core-services/prow/02_config/openshift/prom-label-proxy/_prowconfig.yaml index 6f3d497b3439e..0529dc8fc3927 100644 --- a/core-services/prow/02_config/openshift/prom-label-proxy/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/prom-label-proxy/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/prom-label-proxy - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/prom-label-proxy + - 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/prom-label-proxy - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/prometheus-alertmanager/_prowconfig.yaml b/core-services/prow/02_config/openshift/prometheus-alertmanager/_prowconfig.yaml index fb606c2a524f6..e80e960e768c2 100644 --- a/core-services/prow/02_config/openshift/prometheus-alertmanager/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/prometheus-alertmanager/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/prometheus-alertmanager - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/prometheus-alertmanager + - 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/prometheus-alertmanager - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/prometheus-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/prometheus-operator/_prowconfig.yaml index 92966c12e44a5..022a4b6e8e255 100644 --- a/core-services/prow/02_config/openshift/prometheus-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/prometheus-operator/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/prometheus-operator - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/prometheus-operator + - 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/prometheus-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/prometheus/_prowconfig.yaml b/core-services/prow/02_config/openshift/prometheus/_prowconfig.yaml index 1f4102fddfb07..60418ce9f8d37 100644 --- a/core-services/prow/02_config/openshift/prometheus/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/prometheus/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/prometheus - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/prometheus + - 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/prometheus - 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 8a5a3d92d2f3d..93259a3f0a0c5 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 @@ -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/route-controller-manager - - 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/route-controller-manager - includedBranches: - community-4.6 - community-4.7 @@ -87,6 +48,26 @@ tide: - needs-rebase repos: - openshift/route-controller-manager + - 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/route-controller-manager - excludedBranches: - feature-es6x - feature-prom-connector @@ -213,3 +194,20 @@ tide: - needs-rebase repos: - openshift/route-controller-manager + - 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/route-controller-manager diff --git a/core-services/prow/02_config/openshift/route-override-cni/_prowconfig.yaml b/core-services/prow/02_config/openshift/route-override-cni/_prowconfig.yaml index e34b5ee6e0a56..90e39f9b0dabc 100644 --- a/core-services/prow/02_config/openshift/route-override-cni/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/route-override-cni/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/route-override-cni - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/route-override-cni + - 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/route-override-cni - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/router/_prowconfig.yaml b/core-services/prow/02_config/openshift/router/_prowconfig.yaml index 6769eab3cfd42..828b29de34c29 100644 --- a/core-services/prow/02_config/openshift/router/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/router/_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/router - - 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/router - includedBranches: - community-4.6 - community-4.7 @@ -87,6 +48,26 @@ tide: - needs-rebase repos: - openshift/router + - 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/router - includedBranches: - openshift-4.16 - release-4.16 @@ -105,6 +86,23 @@ tide: - needs-rebase repos: - openshift/router + - 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/router - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/sdn/_prowconfig.yaml b/core-services/prow/02_config/openshift/sdn/_prowconfig.yaml index 459509706e8ff..9e8bb77c61e6f 100644 --- a/core-services/prow/02_config/openshift/sdn/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/sdn/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/sdn - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/sdn + - 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/sdn - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/service-ca-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/service-ca-operator/_prowconfig.yaml index b68bdd56cc5f1..4f82bb45fe03e 100644 --- a/core-services/prow/02_config/openshift/service-ca-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/service-ca-operator/_prowconfig.yaml @@ -1,40 +1,5 @@ tide: queries: - - 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/service-ca-operator - - includedBranches: - - main - - master - labels: - - acknowledge-critical-fixes-only - - 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/service-ca-operator - includedBranches: - community-4.6 - community-4.7 @@ -101,6 +66,23 @@ tide: - needs-rebase repos: - openshift/service-ca-operator + - 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/service-ca-operator - excludedBranches: - feature-es6x - feature-prom-connector @@ -215,6 +197,22 @@ tide: - needs-rebase repos: - openshift/service-ca-operator + - includedBranches: + - main + - master + labels: + - 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/service-ca-operator - excludedBranches: - main - master diff --git a/core-services/prow/02_config/openshift/telemeter/_prowconfig.yaml b/core-services/prow/02_config/openshift/telemeter/_prowconfig.yaml index c822fa38d46d0..5feb3feb00889 100644 --- a/core-services/prow/02_config/openshift/telemeter/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/telemeter/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/telemeter - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/telemeter + - 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/telemeter - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/thanos/_prowconfig.yaml b/core-services/prow/02_config/openshift/thanos/_prowconfig.yaml index d4a51e02271a8..40aa45a31851a 100644 --- a/core-services/prow/02_config/openshift/thanos/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/thanos/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/thanos - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/thanos + - 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/thanos - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/vmware-vsphere-csi-driver-operator/_prowconfig.yaml b/core-services/prow/02_config/openshift/vmware-vsphere-csi-driver-operator/_prowconfig.yaml index 5fff27873f69e..63f8145b3b6f5 100644 --- a/core-services/prow/02_config/openshift/vmware-vsphere-csi-driver-operator/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/vmware-vsphere-csi-driver-operator/_prowconfig.yaml @@ -1,45 +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/vmware-vsphere-csi-driver-operator - - 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/vmware-vsphere-csi-driver-operator - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/vmware-vsphere-csi-driver-operator + - 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/vmware-vsphere-csi-driver-operator - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/vmware-vsphere-csi-driver-operator + - 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/vmware-vsphere-csi-driver-operator - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/vmware-vsphere-csi-driver/_prowconfig.yaml b/core-services/prow/02_config/openshift/vmware-vsphere-csi-driver/_prowconfig.yaml index 5783fd9277e3b..2e6ac3966b9b7 100644 --- a/core-services/prow/02_config/openshift/vmware-vsphere-csi-driver/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/vmware-vsphere-csi-driver/_prowconfig.yaml @@ -1,45 +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/vmware-vsphere-csi-driver - - 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/vmware-vsphere-csi-driver - includedBranches: - community-4.6 - community-4.7 @@ -88,6 +48,26 @@ tide: - needs-rebase repos: - openshift/vmware-vsphere-csi-driver + - 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/vmware-vsphere-csi-driver - excludedBranches: - feature-es6x - feature-prom-connector @@ -161,6 +141,24 @@ tide: - needs-rebase repos: - openshift/vmware-vsphere-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/vmware-vsphere-csi-driver - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/openshift/vsphere-problem-detector/_prowconfig.yaml b/core-services/prow/02_config/openshift/vsphere-problem-detector/_prowconfig.yaml index d3760e7ade218..a4c806198e51d 100644 --- a/core-services/prow/02_config/openshift/vsphere-problem-detector/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/vsphere-problem-detector/_prowconfig.yaml @@ -1,23 +1,34 @@ tide: queries: - includedBranches: - - main - - master + - release-4.0 + - release-4.10 + - release-4.11 + - release-4.12 + - release-4.13 + - release-4.14 + - release-4.15 + - release-4.2 + - release-4.3 + - release-4.4 + - release-4.5 + - release-4.6 + - release-4.7 + - release-4.8 + - release-4.9 labels: - - acknowledge-critical-fixes-only - approved - - docs-approved + - backport-risk-assessed + - cherry-pick-approved + - jira/valid-bug - 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/vsphere-problem-detector @@ -25,11 +36,12 @@ tide: - main - master labels: - - acknowledge-critical-fixes-only - approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -40,14 +52,18 @@ tide: - needs-rebase repos: - openshift/vsphere-problem-detector - - includedBranches: + - excludedBranches: + - main + - master - 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.2 - release-4.3 - release-4.4 @@ -58,11 +74,11 @@ tide: - release-4.9 labels: - approved - - backport-risk-assessed - - cherry-pick-approved - - jira/valid-bug + - docs-approved - jira/valid-reference - lgtm + - px-approved + - qe-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -72,33 +88,15 @@ tide: - needs-rebase repos: - openshift/vsphere-problem-detector - - excludedBranches: - - main - - master - - release-4.0 - - release-4.1 - - release-4.10 - - release-4.11 - - release-4.12 - - release-4.13 - - release-4.14 - - release-4.15 + - includedBranches: + - openshift-4.16 - release-4.16 - - release-4.2 - - 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 + - jira/valid-bug - jira/valid-reference - lgtm - - px-approved - - qe-approved + - staff-eng-approved missingLabels: - backports/unvalidated-commits - do-not-merge/hold @@ -109,20 +107,20 @@ tide: repos: - openshift/vsphere-problem-detector - includedBranches: - - openshift-4.16 - - release-4.16 + - main + - master labels: - approved - jira/valid-bug - jira/valid-reference - 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/vsphere-problem-detector diff --git a/core-services/prow/02_config/openshift/whereabouts-cni/_prowconfig.yaml b/core-services/prow/02_config/openshift/whereabouts-cni/_prowconfig.yaml index 18c412e0b82e4..1315cdc30a374 100644 --- a/core-services/prow/02_config/openshift/whereabouts-cni/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/whereabouts-cni/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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/whereabouts-cni - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - openshift/whereabouts-cni + - 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/whereabouts-cni - excludedBranches: - feature-es6x - feature-prom-connector diff --git a/core-services/prow/02_config/operator-framework/operator-marketplace/_prowconfig.yaml b/core-services/prow/02_config/operator-framework/operator-marketplace/_prowconfig.yaml index 671bfa31693fc..720cda27995d9 100644 --- a/core-services/prow/02_config/operator-framework/operator-marketplace/_prowconfig.yaml +++ b/core-services/prow/02_config/operator-framework/operator-marketplace/_prowconfig.yaml @@ -1,23 +1,5 @@ tide: queries: - - 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: - - operator-framework/operator-marketplace - includedBranches: - community-4.6 - community-4.7 @@ -84,6 +66,23 @@ tide: - needs-rebase repos: - operator-framework/operator-marketplace + - 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: + - operator-framework/operator-marketplace - excludedBranches: - feature-es6x - feature-prom-connector