From 7da1d8b3b07bb4571b4c4888aed9c9e1d8c07a71 Mon Sep 17 00:00:00 2001 From: MitaliBhalla Date: Tue, 2 Jun 2026 10:08:29 +0530 Subject: [PATCH 1/3] ROSA-745: branch-protection for lpsre (Konflux + mandatory prow) Require primary Konflux on-pull-request and mandatory ci/prow/* presubmits (non-optional only; derived from ci-operator presubmits + DPP-20685 list). Repo settings (auto-merge, merge commits) remain DPP. Repos: rosa --- .../02_config/openshift/rosa/_prowconfig.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/core-services/prow/02_config/openshift/rosa/_prowconfig.yaml b/core-services/prow/02_config/openshift/rosa/_prowconfig.yaml index f45b23dd7b819..4ea54ccd3a482 100644 --- a/core-services/prow/02_config/openshift/rosa/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/rosa/_prowconfig.yaml @@ -1,3 +1,18 @@ +branch-protection: + orgs: + openshift: + repos: + rosa: + branches: + master: + protect: true + required_status_checks: + contexts: + - Red Hat Konflux / rosa-on-pull-request + - ci/prow/build + - ci/prow/commits + - ci/prow/lint + - ci/prow/test tide: queries: - labels: From 909bfecb478d441aad7244470d966227b6f8ecf2 Mon Sep 17 00:00:00 2001 From: MitaliBhalla Date: Tue, 2 Jun 2026 15:13:08 +0530 Subject: [PATCH 2/3] ROSA-745: fix rosa branch-protection (Konflux + tide required-if-present) Remove conditional prow from branch-protection; gate build/commits/lint/test via _config.yaml required-if-present-contexts when those jobs run. Co-authored-by: Cursor --- core-services/prow/02_config/_config.yaml | 8 ++++++++ .../prow/02_config/openshift/rosa/_prowconfig.yaml | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core-services/prow/02_config/_config.yaml b/core-services/prow/02_config/_config.yaml index d5f2db42d5af8..f5a78c92032c9 100644 --- a/core-services/prow/02_config/_config.yaml +++ b/core-services/prow/02_config/_config.yaml @@ -751,6 +751,14 @@ tide: managed-velero-operator: optional-regex-contexts: - codecov/project + rosa: + branches: + master: + required-if-present-contexts: + - ci/prow/build + - ci/prow/commits + - ci/prow/lint + - ci/prow/test release: skip-unknown-contexts: true openshift-priv: diff --git a/core-services/prow/02_config/openshift/rosa/_prowconfig.yaml b/core-services/prow/02_config/openshift/rosa/_prowconfig.yaml index 4ea54ccd3a482..aa289fa6220d5 100644 --- a/core-services/prow/02_config/openshift/rosa/_prowconfig.yaml +++ b/core-services/prow/02_config/openshift/rosa/_prowconfig.yaml @@ -9,10 +9,6 @@ branch-protection: required_status_checks: contexts: - Red Hat Konflux / rosa-on-pull-request - - ci/prow/build - - ci/prow/commits - - ci/prow/lint - - ci/prow/test tide: queries: - labels: From 18df2ca1b01e034c27ae4f142f9cc6bc305f0146 Mon Sep 17 00:00:00 2001 From: MitaliBhalla Date: Tue, 2 Jun 2026 17:38:43 +0530 Subject: [PATCH 3/3] Sort openshift tide repos in _config.yaml for prow-config CI Co-authored-by: Cursor --- core-services/prow/02_config/_config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-services/prow/02_config/_config.yaml b/core-services/prow/02_config/_config.yaml index f5a78c92032c9..697b94946001c 100644 --- a/core-services/prow/02_config/_config.yaml +++ b/core-services/prow/02_config/_config.yaml @@ -751,6 +751,8 @@ tide: managed-velero-operator: optional-regex-contexts: - codecov/project + release: + skip-unknown-contexts: true rosa: branches: master: @@ -759,8 +761,6 @@ tide: - ci/prow/commits - ci/prow/lint - ci/prow/test - release: - skip-unknown-contexts: true openshift-priv: repos: assisted-installer: