Skip to content

tide: set github_merge_blocks_policy to block for all RHDH repos - #82975

Closed
zdrapela wants to merge 1 commit into
openshift:mainfrom
zdrapela:tide-rhdh-github-merge-blocks-policy
Closed

tide: set github_merge_blocks_policy to block for all RHDH repos#82975
zdrapela wants to merge 1 commit into
openshift:mainfrom
zdrapela:tide-rhdh-github-merge-blocks-policy

Conversation

@zdrapela

@zdrapela zdrapela commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Summary

Repos

  • redhat-developer/rhdh
  • redhat-developer/rhdh-chart
  • redhat-developer/rhdh-operator
  • redhat-developer/rhdh-plugin-certification
  • redhat-developer/rhdh-test-instance

Test plan

  • Confirm entries appear under tide.github_merge_blocks_policy in core-services/prow/02_config/_config.yaml
  • CI config validation passes

Made with Cursor

Summary by CodeRabbit

  • Configures Tide to block merge retries for five RHDH repositories when GitHub branch protection blocks a pull request.
  • Applies the policy to rhdh, rhdh-chart, rhdh-operator, rhdh-plugin-certification, and rhdh-test-instance.
  • Makes Tide respect GitHub’s mergeStateStatus.

Make Tide respect GitHub mergeStateStatus for RHDH repositories so
blocked PRs are skipped instead of retry-looping the merge queue.
@coderabbitai

coderabbitai Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: e8274711-c0bd-4f94-a08f-45e813ab0990

📥 Commits

Reviewing files that changed from the base of the PR and between f34bc05 and 9caaed8.

📒 Files selected for processing (1)
  • core-services/prow/02_config/_config.yaml

Walkthrough

This PR updates Tide configuration in core-services/prow/02_config/_config.yaml. It adds merge-block policy entries for five redhat-developer Red Hat Developer Hub repositories.

Changes

RHDH Tide policy configuration

Layer / File(s) Summary
Add Tide block policies
core-services/prow/02_config/_config.yaml
The config adds github_merge_blocks_policy: block entries for rhdh, rhdh-chart, rhdh-operator, rhdh-plugin-certification, and rhdh-test-instance.

Estimated code review effort: 1 (Trivial) | ~3 minutes

Possibly related issues

Possibly related PRs

  • openshift/release#80150: Both PRs add tide.github_merge_blocks_policy: block entries in core-services/prow/02_config/_config.yaml.
  • openshift/release#82902: Both PRs update the same config file to add Tide merge-block policy for repositories.
  • openshift/release#82954: Both PRs add Tide merge-block configuration for repository-specific Prow settings.

Suggested reviewers: mitalibhalla, openshift-bot

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes setting the merge-block policy for all RHDH repositories.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed This PR is not applicable to the check. The PR modifies only YAML Prow configuration files, adding Tide merge-block policies for five RHDH repositories. No Ginkgo test files or test definitions are...
Test Structure And Quality ✅ Passed PR contains only YAML configuration changes to Prow merge policies, not Ginkgo test code. Check is not applicable.
Microshift Test Compatibility ✅ Passed The pull request changes only Tide YAML configuration and adds no Ginkgo tests, OpenShift API references, or MicroShift assumptions.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR adds only Prow configuration entries (no Ginkgo e2e tests). The custom check applies only to new test code and is inapplicable here.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only Prow CI configuration (github_merge_blocks_policy settings), not deployment manifests, operator code, or controllers. No scheduling constraints introduced.
Ote Binary Stdout Contract ✅ Passed The PR changes only Tide YAML entries; it adds no OTE binary, Go test, suite setup, or process-level stdout code to assess.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR adds Tide merge-block policy configurations to a YAML file only. No new Ginkgo e2e tests are added, so the IPv6/disconnected network test compatibility check is not applicable.
No-Weak-Crypto ✅ Passed The PR modifies only YAML configuration in core-services/prow/02_config/_config.yaml, adding Tide merge-block policies. No cryptographic code, weak crypto patterns, or security-sensitive implementa...
Container-Privileges ✅ Passed The PR modifies a Prow CI configuration file only. The file contains no container or Kubernetes manifests with privileged settings, hostPID, hostNetwork, hostIPC, SYS_ADMIN capabilities, or allowPr...
No-Sensitive-Data-In-Logs ✅ Passed The PR changes only five YAML Tide policy entries with repository names and block; it adds no logging code or sensitive data.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@openshift-ci

openshift-ci Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: zdrapela
Once this PR has been reviewed and has the lgtm label, please assign deepsm007 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
openshift-ci Bot requested review from deepsm007 and psalajova August 5, 2026 14:59
@zdrapela zdrapela closed this Aug 5, 2026
@zdrapela

zdrapela commented Aug 5, 2026

Copy link
Copy Markdown
Contributor Author

I missed that the important RHDH repos are already part of #80150. I'll wait for it to be merged. Thanks

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Aug 5, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@zdrapela: no rehearsable tests are affected by this change

Note: If this PR includes changes to step registry files (ci-operator/step-registry/) and you expected jobs to be found, try rebasing your PR onto the base branch. This helps pj-rehearse accurately detect changes when the base branch has moved forward.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant