Skip to content

ROSA-745: branch-protection for non-boilerplate repos #80263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 8 commits into from
Jun 29, 2026
Merged

ROSA-745: branch-protection for non-boilerplate repos #80263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f99a915
ROSA-745: branch-protection for non-boilerplate repos
MitaliBhalla Jun 9, 2026
c3f12c0
Fix _config.yaml repo ordering for prow-config (release before rosa)
MitaliBhalla Jun 9, 2026
be9b442
Revert managed-cluster-config from ROSA-745 branch-protection PR
MitaliBhalla Jun 9, 2026
23098a2
ROSA-745: require enterprise-contract for openshift/rosa master
MitaliBhalla Jun 11, 2026
bc0807e
ROSA-745: drop cluster-api-provider-aws from branch-protection
MitaliBhalla Jun 11, 2026
83f83d7
ROSA-745: require osdctl format and verify-docs on master
MitaliBhalla Jun 16, 2026
e146d48
Address review: align required checks and drop CAPA tide edits
MitaliBhalla Jun 16, 2026
9400d5f
ROSA-745: drop scan-optional from backplane-cli branch-protection
MitaliBhalla Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions core-services/prow/02_config/_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,14 @@ tide:
- ci/prow/validate
release:
skip-unknown-contexts: true
rosa:
branches:
master:
required-if-present-contexts:
- ci/prow/build
- ci/prow/commits
- ci/prow/lint
- ci/prow/test
route-monitor-operator:
branches:
master:
Expand Down
15 changes: 15 additions & 0 deletions core-services/prow/02_config/openshift/backplane-cli/_prowconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
branch-protection:
orgs:
openshift:
repos:
backplane-cli:
branches:
main:
protect: true
required_status_checks:
contexts:
- ci/prow/build
- ci/prow/coverage
- ci/prow/images
- ci/prow/lint
- ci/prow/test
tide:
queries:
- labels:
Expand Down
13 changes: 13 additions & 0 deletions core-services/prow/02_config/openshift/backplane-tools/_prowconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
branch-protection:
orgs:
openshift:
repos:
backplane-tools:
branches:
main:
protect: true
required_status_checks:
contexts:
- ci/prow/coverage
- ci/prow/lint
- ci/prow/unit
tide:
queries:
- labels:
Expand Down
15 changes: 15 additions & 0 deletions core-services/prow/02_config/openshift/osdctl/_prowconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
branch-protection:
orgs:
openshift:
repos:
osdctl:
branches:
master:
protect: true
required_status_checks:
contexts:
- ci/prow/build
- ci/prow/format
- ci/prow/lint
- ci/prow/test
Comment thread
MitaliBhalla marked this conversation as resolved.
- ci/prow/verify-docs
tide:
queries:
- labels:
Expand Down
15 changes: 15 additions & 0 deletions core-services/prow/02_config/openshift/rosa/_prowconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Comment thread
MitaliBhalla marked this conversation as resolved.
- Red Hat Konflux / rh-rosa-cli-enterprise-contract / rosa

@olucasfreitas olucasfreitas Jun 11, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If _prowconfig.yaml is supposed to capture rosa’s always-run mandatory ci/prow/* jobs, this list is still incomplete. Real MintMaker PRs report ci/prow/e2e-presubmits-images, ci/prow/images-images, and ci/prow/images-release-images, but none of them gate merges here.

@MitaliBhalla MitaliBhalla Jun 16, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added the three always-run prow contexts (e2e-presubmits-images, images-images, images-release-images) to branch-protection in e146d48 alongside the Konflux checks. Conditional prow jobs (build, commits, lint, test) remain required-if-present-contexts in _config.yaml since they are not always-run on MintMaker/dep PRs.

- ci/prow/e2e-presubmits-images
- ci/prow/images-images
- ci/prow/images-release-images
tide:
merge_method:
openshift/rosa: squash
Expand Down