From c97dbab9aa9090eaef8d492a5c5a2150e9b107eb Mon Sep 17 00:00:00 2001 From: Michal Pryc Date: Wed, 17 Sep 2025 23:11:39 +0200 Subject: [PATCH] Add tide for the oadp-1.4 branch for oadp-non-admin Adds Tide config for the oadp-1.4 branch of the migtools/oadp-non-admin project. Removes squash method to ensure rebasebot functions properly on that repository. Signed-off-by: Michal Pryc --- .../prow/02_config/migtools/oadp-non-admin/_prowconfig.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core-services/prow/02_config/migtools/oadp-non-admin/_prowconfig.yaml b/core-services/prow/02_config/migtools/oadp-non-admin/_prowconfig.yaml index f06044d1efc6f..5bf0a3b119a64 100644 --- a/core-services/prow/02_config/migtools/oadp-non-admin/_prowconfig.yaml +++ b/core-services/prow/02_config/migtools/oadp-non-admin/_prowconfig.yaml @@ -14,11 +14,10 @@ branch-protection: dismiss_stale_reviews: true required_approving_review_count: 2 tide: - merge_method: - migtools/oadp-non-admin: squash queries: - includedBranches: - master + - oadp-1.4 - oadp-1.5 labels: - approved