Skip to content

fix the prow config conflict#81244

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
tkong-redhat:fix-hulk-config-conflict
Jun 30, 2026
Merged

fix the prow config conflict#81244
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
tkong-redhat:fix-hulk-config-conflict

Conversation

@tkong-redhat

@tkong-redhat tkong-redhat commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

e2e-binary-build-success is optional and is not running always.

Putting it into required check which caused the conflict issue in prow. Hence remove it from required check.

Put the check in tide

Summary by CodeRabbit

This PR adjusts OpenShift CI/prow configuration to resolve the e2e-binary-build-success check conflict by moving it out of branch protection and into Tide handling where appropriate.

In practice, this means:

  • Several OpenShift component repos no longer require ci/prow/e2e-binary-build-success as a mandatory branch-protection status check on their protected branches.
  • The shared prow config adds that check to Tide’s required-if-present context rules for the affected repos, so merge gating stays aligned without forcing the check as a hard requirement.
  • Affected repos include certman-operator, managed-node-metadata-operator, managed-upgrade-operator, ocm-agent, and ocm-agent-operator, along with corresponding Tide updates in the central prow config.

This should prevent the inconsistent optional check from conflicting with Prow’s required checks while preserving merge protection through Tide.

@coderabbitai

coderabbitai Bot commented Jun 29, 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: 12d8d115-0a61-46a2-8044-6ed2643e961d

📥 Commits

Reviewing files that changed from the base of the PR and between 81be3f9 and d60443b.

📒 Files selected for processing (6)
  • core-services/prow/02_config/_config.yaml
  • core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/ocm-agent/_prowconfig.yaml
💤 Files with no reviewable changes (5)
  • core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/ocm-agent/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • core-services/prow/02_config/_config.yaml

Walkthrough

ci/prow/e2e-binary-build-success is removed from hard branch-protection requirements in five OpenShift prowconfig files and added to Tide required-if-present-contexts entries in the shared _config.yaml.

Changes

e2e-binary-build-success context migration

Layer / File(s) Summary
Global Tide context updates
core-services/prow/02_config/_config.yaml
Adds ci/prow/e2e-binary-build-success to OpenShift Tide required-if-present-contexts, including expanded entries for managed-velero-operator, ocm-agent, and ocm-agent-operator.
Per-repo branch-protection removals
core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml, core-services/prow/02_config/openshift/ocm-agent/_prowconfig.yaml
Removes ci/prow/e2e-binary-build-success from required_status_checks.contexts in the listed repos.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Possibly related PRs

  • openshift/release#81211: Modifies the same _config.yaml Tide required-if-present-contexts blocks for a different set of repos.

Suggested labels

lgtm, approved

Suggested reviewers

  • danilo-gemoli
  • deepsm007
  • droslean
🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 inconclusive)

Check name Status Explanation Resolution
Title check ❓ Inconclusive The title is related to the change but too vague to describe the specific Prow config updates. Use a more specific title like 'Move e2e-binary-build-success from required checks to Tide in prow config'.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
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 The PR only edits prow YAML config under core-services/prow/02_config; no Ginkgo test definitions or titles are present in the changed files.
Test Structure And Quality ✅ Passed PR only changes prow YAML config; no Ginkgo test code or It blocks are touched, so this check is not applicable.
Microshift Test Compatibility ✅ Passed PR only changes Prow/Tide config YAML; no new Ginkgo e2e test code was added, so MicroShift compatibility isn’t applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed Only prow YAML config changed; no Ginkgo tests were added or modified, so the SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed Only Prow YAML changed; no manifests, operators, or controller scheduling logic were modified.
Ote Binary Stdout Contract ✅ Passed PR only updates prow YAML required-check context lists; no process-level binary code or stdout writes are changed, so the stdout contract is unaffected.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR only adjusts Prow branch-protection/Tide YAML; no Ginkgo e2e tests were added or modified.
No-Weak-Crypto ✅ Passed PASS: The patch only edits Prow YAML status-checks; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret-comparison code is introduced.
Container-Privileges ✅ Passed Touched files are Prow branch-protection/tide configs only; no container/K8s manifests or privilege flags (privileged/hostPID/hostNetwork/etc.) were introduced.
No-Sensitive-Data-In-Logs ✅ Passed Changed files only adjust Prow/Tide status-check lists; no log statements, secrets, tokens, PII, or hostnames were added.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-ci openshift-ci Bot requested review from bear-redhat and bmeng June 29, 2026 22:19
@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 29, 2026

@coderabbitai coderabbitai Bot left a comment

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.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@core-services/prow/02_config/_config.yaml`:
- Around line 848-853: The required-if-present-contexts list for the ocm-agent
config is missing ci/prow/validate and incorrectly duplicates ci/prow/coverage,
so update this context set to match the other migrations in the PR. Fix the list
in the relevant _config.yaml block by restoring ci/prow/validate and removing
the duplicate coverage entry, keeping the existing required context names
aligned with the ocm-agent migration.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: c5c5f14b-82c9-48d6-b236-aa63548de981

📥 Commits

Reviewing files that changed from the base of the PR and between b3f5f5d and 81be3f9.

📒 Files selected for processing (6)
  • core-services/prow/02_config/_config.yaml
  • core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/ocm-agent/_prowconfig.yaml
💤 Files with no reviewable changes (5)
  • core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/ocm-agent/_prowconfig.yaml
  • core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml
  • core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml

Comment thread core-services/prow/02_config/_config.yaml
@tkong-redhat tkong-redhat force-pushed the fix-hulk-config-conflict branch from 81be3f9 to d60443b Compare June 29, 2026 22:30
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@tkong-redhat: 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.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

@tkong-redhat: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@chamalabey

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 29, 2026
@hector-vido

Copy link
Copy Markdown
Contributor

/approve

@openshift-ci

openshift-ci Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chamalabey, hector-vido, tkong-redhat

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

The pull request process is described 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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 30, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit fd3912d into openshift:main Jun 30, 2026
12 checks passed
@openshift-ci

openshift-ci Bot commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

@tkong-redhat: Updated the following 2 configmaps:

  • config configmap in namespace ci at cluster core-ci using the following files:
    • key config.yaml using file core-services/prow/02_config/_config.yaml
    • key core-services-prow-02_config-openshift-certman-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-managed-node-metadata-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-managed-upgrade-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-ocm-agent-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-ocm-agent-_prowconfig.yaml using file core-services/prow/02_config/openshift/ocm-agent/_prowconfig.yaml
  • config configmap in namespace ci at cluster app.ci using the following files:
    • key config.yaml using file core-services/prow/02_config/_config.yaml
    • key core-services-prow-02_config-openshift-certman-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/certman-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-managed-node-metadata-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/managed-node-metadata-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-managed-upgrade-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/managed-upgrade-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-ocm-agent-operator-_prowconfig.yaml using file core-services/prow/02_config/openshift/ocm-agent-operator/_prowconfig.yaml
    • key core-services-prow-02_config-openshift-ocm-agent-_prowconfig.yaml using file core-services/prow/02_config/openshift/ocm-agent/_prowconfig.yaml
Details

In response to this:

e2e-binary-build-success is optional and is not running always.

Putting it into required check which caused the conflict issue in prow. Hence remove it from required check.

Put the check in tide

Summary by CodeRabbit

This PR adjusts OpenShift CI/prow configuration to resolve the e2e-binary-build-success check conflict by moving it out of branch protection and into Tide handling where appropriate.

In practice, this means:

  • Several OpenShift component repos no longer require ci/prow/e2e-binary-build-success as a mandatory branch-protection status check on their protected branches.
  • The shared prow config adds that check to Tide’s required-if-present context rules for the affected repos, so merge gating stays aligned without forcing the check as a hard requirement.
  • Affected repos include certman-operator, managed-node-metadata-operator, managed-upgrade-operator, ocm-agent, and ocm-agent-operator, along with corresponding Tide updates in the central prow config.

This should prevent the inconsistent optional check from conflicting with Prow’s required checks while preserving merge protection through Tide.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants