Skip to content

Conversation

@djoshy
Copy link
Contributor

@djoshy djoshy commented Nov 7, 2025

This sets all of MCO's non metal 4.21 & 4.22 disruptive jobs to the standard tier, permitting them report to MCO's CR. All 4.19/4.20 jobs and metal jobs have been excluded.

Summary by CodeRabbit

  • Chores
    • Refined job tier classifications for Machine Config Operator-related tests with granular control by specific platform variants and software releases.
    • Updated default handling for MCO-related jobs to improve resource allocation.
    • Expanded test configuration entries for specific platform types and upgrade paths in CI infrastructure.

@openshift-ci-robot
Copy link

Pipeline controller notification
This repository is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. Review these jobs and use /test <job> to manually trigger optional jobs most likely to be impacted by the proposed changes.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 7, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 7, 2025

@djoshy: This pull request references MCO-1968 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

This sets all of MCO's non metal disruptive jobs to the standard tier, permitting them report to MCO's CR. All 4.19/4.20 jobs and metal jobs have been excluded.

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 openshift-eng/jira-lifecycle-plugin repository.

@djoshy djoshy changed the title MCO-1968: Move cloud disruptive test variants to standard in sippy MCO-1968: Move cloud disruptive test variants to standard jobTier in sippy Nov 7, 2025
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Nov 7, 2025

Walkthrough

This PR refactors machine configuration operator (MCO) job tier assignments in the variant registry. It replaces a historical MCO-related candidate entry with granular metal-specific and release-specific MCO variants, introduces new AWS OVN OCL standard entries, and adjusts default MCO job tier handling from candidate to standard.

Changes

Cohort / File(s) Summary
MCO Job Tier Refactoring
pkg/variantregistry/ocp.go
Replaces single {-mco-disruptive} candidate mapping with: three metal-specific MCO disruptive entries (candidate tier), two AWS OVN OCL entries (standard tier), two release-specific MCO entries for 4.19/4.20 (candidate tier), and updates default MCO disruptive handling to standard tier.
JobTier Value Updates
pkg/variantregistry/snapshot.yaml
Updates JobTier field from candidate to standard across multiple periodic CI entries. Bulk configuration change with no structural alterations.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~15 minutes

  • Verify MCO job tier logic changes produce expected categorization across all variants
  • Confirm snapshot.yaml updates align with ocp.go registry changes and reflect intended CI job prioritization
  • Ensure no existing functionality is inadvertently affected by the tier reassignments

Pre-merge checks and finishing touches

❌ Failed checks (1 warning)
Check name Status Explanation Resolution
Single Responsibility And Clear Naming ⚠️ Warning OCPRegistry struct contains duplicate sync.RWMutex fields (mu and lock), violating Single Responsibility by maintaining multiple redundant synchronization primitives instead of one clear locking mechanism. Remove duplicate lock fields and keep only one descriptive RWMutex (e.g., ruleMutex) to ensure single synchronization responsibility and consistent usage across all methods.
✅ Passed checks (6 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Go Error Handling ✅ Passed PR contains YAML configuration updates without substantive Go error handling code changes, so no violations to assess.
Sql Injection Prevention ✅ Passed Pull request modifies configuration files with job tier mappings and CI/CD variant registry data. No SQL query construction, database operations, or dynamic query building is present.
Excessive Css In React Should Use Styles ✅ Passed PR modifies Go and YAML backend files, not React components with inline CSS.
Title check ✅ Passed The title clearly references the specific Jira issue (MCO-1968) and accurately summarizes the main change: moving cloud disruptive test variants to standard jobTier in sippy.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
✨ Finishing touches
  • 📝 Generate docstrings

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

@openshift-ci openshift-ci bot requested review from smg247 and sosiouxme November 7, 2025 19:48
@djoshy
Copy link
Contributor Author

djoshy commented Nov 7, 2025

/hold

Throwing in a hold for the moment, need to get consensus from the MCO team 😄

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 7, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 7, 2025

@djoshy: This pull request references MCO-1968 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.21.0" version, but no target version was set.

Details

In response to this:

This sets all of MCO's non metal disruptive jobs to the standard tier, permitting them report to MCO's CR. All 4.19/4.20 jobs and metal jobs have been excluded.

Summary by CodeRabbit

  • Chores
  • Refined job tier classifications for Machine Config Operator-related tests with granular control by specific platform variants and software releases.
  • Updated default handling for MCO-related jobs to improve resource allocation.
  • Expanded test configuration entries for specific platform types and upgrade paths in CI infrastructure.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

Scheduling required tests:
/test e2e

@djoshy djoshy force-pushed the promo-mco-cloud-tests branch from add7784 to 7dfe959 Compare December 18, 2025 21:05
@djoshy
Copy link
Contributor Author

djoshy commented Dec 18, 2025

Updated to include 4.22 cloud periodics.

@djoshy
Copy link
Contributor Author

djoshy commented Dec 19, 2025

/test unit

@openshift-ci-robot
Copy link

Scheduling required tests:
/test e2e

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 6, 2026

@djoshy: This pull request references MCO-1968 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

This sets all of MCO's non metal 4.21 & 4.22 disruptive jobs to the standard tier, permitting them report to MCO's CR. All 4.19/4.20 jobs and metal jobs have been excluded.

Summary by CodeRabbit

  • Chores
  • Refined job tier classifications for Machine Config Operator-related tests with granular control by specific platform variants and software releases.
  • Updated default handling for MCO-related jobs to improve resource allocation.
  • Expanded test configuration entries for specific platform types and upgrade paths in CI infrastructure.

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link
Member

@isabella-janssen isabella-janssen left a comment

Choose a reason for hiding this comment

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

/lgtm

Looks good to me from the MCO side. Thank you @djoshy 🎉

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2026
@djoshy
Copy link
Contributor Author

djoshy commented Jan 7, 2026

/unhold

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 7, 2026
@djoshy
Copy link
Contributor Author

djoshy commented Jan 7, 2026

/test all

Copy link
Contributor

@xueqzhan xueqzhan left a comment

Choose a reason for hiding this comment

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

Some comments. Unit test seems to be failing too.


// Periodic MCO jobs used for component readiness; not ready to make
// release blocking yet.
{[]string{"-mco-disruptive"}, "candidate"},
Copy link
Contributor

Choose a reason for hiding this comment

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

Passing rates for a few jobs are still pretty low (i.e. vsphere):

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The vsphere suite seems to be recovering - would it be okay to keep that in candidate and bump the rest to standard instead? I am unsure why the unit is failing, will investigate!

{[]string{"metal-ipi-ovn-ipv6-mco-disruptive"}, "candidate"},

// Set MCO OCL jobs to standard
{[]string{"e2e-aws-ovn-ocl"}, "standard"},
Copy link
Contributor

Choose a reason for hiding this comment

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

I will group all standard in the standard section above. Also I only see one job run for e2e-aws-ovn-ocl in sippy in the last 7 days and it failed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, sorry - meant to keep these in candidate, we don't really monitor these for CR at the moment.

@djoshy djoshy force-pushed the promo-mco-cloud-tests branch from 7dfe959 to c1a26a3 Compare January 7, 2026 18:10
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 7, 2026
@djoshy djoshy force-pushed the promo-mco-cloud-tests branch from c1a26a3 to 47c25d6 Compare January 7, 2026 18:16
@djoshy djoshy force-pushed the promo-mco-cloud-tests branch from 47c25d6 to 5c7ff8d Compare January 7, 2026 20:10
@djoshy
Copy link
Contributor Author

djoshy commented Jan 7, 2026

Ah, I forgot rebase for the unit, that should be fixed now 😄

@openshift-ci-robot
Copy link

Scheduling required tests:
/test e2e

@xueqzhan
Copy link
Contributor

xueqzhan commented Jan 8, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 8, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 8, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, isabella-janssen, xueqzhan

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 Jan 8, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 8, 2026

@djoshy: 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.

@openshift-merge-bot openshift-merge-bot bot merged commit 6e27d39 into openshift:main Jan 8, 2026
9 checks passed
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants