OCPBUGS-81284: fix(release): allow multiple machine-os component versions by bryan-cox · Pull Request #8101 · openshift/hypershift

bryan-cox · 2026-03-28T20:31:40Z

What this PR does / why we need it:

Allow multiple machine-os versions in component version skew checks to support dual stream efforts. This mirrors the same change from openshift/oc#2157.

Two locations in support/releaseinfo/releaseinfo.go (readComponentVersions) updated to skip adding machine-os to the multiples error set, allowing multiple versions of the machine-os component without triggering a version skew error.

Which issue(s) this PR fixes:

Fixes OCPBUGS-81284

Special notes for your reviewer:

Requested by @ardaguclu in this review comment.

Checklist:

Subject and description added to both, commit and PR.
Relevant issues have been referenced.
This change includes docs.
This change includes unit tests.

Summary by CodeRabbit

Bug Fixes
- Improved handling of duplicate component version entries so OS image versions are treated separately from other components during aggregation, reducing false error reports and ensuring OS versions are still reported when multiple values exist.
Tests
- Added unit tests covering multiple-version scenarios for OS image and other components to validate aggregation and error reporting behavior.

openshift-ci-robot · 2026-03-28T20:31:43Z

Pipeline controller notification
This repo 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. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

coderabbitai · 2026-03-28T20:31:56Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: bfd56e33-3b06-4912-b8e4-2e50377ba54e

📥 Commits

Reviewing files that changed from the base of the PR and between 3d344dc and 66e356c.

📒 Files selected for processing (1)

support/releaseinfo/releaseinfo_test.go

🚧 Files skipped from review as they are similar to previous changes (1)

support/releaseinfo/releaseinfo_test.go

📝 Walkthrough

Walkthrough

The pull request modifies readComponentVersions in support/releaseinfo/releaseinfo.go to treat the "machine-os" component specially when multiple reported values are present: duplicates for "machine-os" are recorded without adding it to the multiples set, while other components with multiple values are added to multiples. This change is applied in both the semantic-version selection pass and the display-name population pass.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

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

openshift-ci · 2026-03-28T20:31:58Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox

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:

~~OWNERS~~ [bryan-cox]

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

coderabbitai · 2026-03-28T20:31:58Z

Caution

Review failed

The head commit changed during the review from bd96512 to e43e3a4.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

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

Allow multiple machine-os versions in component version checks to support dual stream efforts. This mirrors the same change in openshift/oc#2157. Refs: openshift/oc#2157 Signed-off-by: Bryan Cox <brcox@redhat.com> Commit-Message-Assisted-by: Claude (via Claude Code) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

openshift-ci-robot · 2026-03-28T20:35:36Z

@bryan-cox: This pull request references Jira Issue OCPBUGS-81284, which is invalid:

expected the bug to target either version "4.22." or "openshift-4.22.", but it targets "4.21" instead
expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Summary

Allow multiple machine-os versions in component version skew checks to support dual stream efforts

Mirrors the same change from openshift/oc#2157

Requested by @ardaguclu in this review comment

Changes

Two locations in support/releaseinfo/releaseinfo.go (readComponentVersions) updated to skip adding machine-os to the multiples error set, allowing multiple versions of the machine-os component without triggering a version skew error.

Test plan

Unit tests pass (go test ./support/releaseinfo/...)

Build compiles cleanly

🤖 Generated with Claude Code

Summary by CodeRabbit

Bug Fixes

Fixed handling of duplicate machine OS component versions during aggregation to properly distinguish machine OS components from other components.

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.

bryan-cox · 2026-03-28T20:36:40Z

/jira refresh

openshift-ci-robot · 2026-03-28T20:36:44Z

@bryan-cox: This pull request references Jira Issue OCPBUGS-81284, which is invalid:

expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

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.

bryan-cox · 2026-03-28T20:38:44Z

/jira refresh

openshift-ci-robot · 2026-03-28T20:38:50Z

@bryan-cox: This pull request references Jira Issue OCPBUGS-81284, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.22.0) matches configured target version for branch (4.22.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

/jira refresh

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.

bryan-cox · 2026-03-28T20:42:04Z

/test e2e-conformance

neisw · 2026-03-28T22:32:36Z

/lgtm
/hold
until validated

openshift-ci-robot · 2026-03-28T22:32:50Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

bryan-cox · 2026-03-28T22:36:21Z

/override ci/prow/e2e-azure-self-managed

This is failing due to issues outside this PR.

openshift-ci-robot · 2026-03-28T23:04:19Z

@bryan-cox: This PR has been marked as verified by conformance.

Details

In response to this:

/verified by conformance

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.

neisw · 2026-03-29T00:03:49Z

/unhold

cwbotbot · 2026-03-29T00:15:08Z

Test Results

e2e-aws

Status: ✅ PASS
Started: 2026-03-28T22:33:24Z
View Job
View Job History

e2e-aks

Status: ✅ PASS
Started: 2026-03-28T22:33:24Z
View Job
View Job History

codecov · 2026-03-29T00:28:09Z

Codecov Report

❌ Patch coverage is 66.66667% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 26.61%. Comparing base (c25481f) to head (66e356c).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #8101      +/-   ##
==========================================
+ Coverage   26.56%   26.61%   +0.05%     
==========================================
  Files        1087     1087              
  Lines      105042   105043       +1     
==========================================
+ Hits        27902    27956      +54     
+ Misses      74731    74671      -60     
- Partials     2409     2416       +7

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

bryan-cox · 2026-03-29T00:41:39Z

/override ci/prow/e2e-aks
/override ci/prow/e2e-aws
/override ci/prow/e2e-aws-upgrade-hypershift-operator
/override ci/prow/e2e-azure-self-managed
/override ci/prow/e2e-kubevirt-aws-ovn-reduced
/override ci/prow/e2e-v2-aws

i just added a unit test to make codecov pass

openshift-ci · 2026-03-29T00:41:55Z

@bryan-cox: Overrode contexts on behalf of bryan-cox: ci/prow/e2e-aks, ci/prow/e2e-aws, ci/prow/e2e-aws-upgrade-hypershift-operator, ci/prow/e2e-azure-self-managed, ci/prow/e2e-kubevirt-aws-ovn-reduced, ci/prow/e2e-v2-aws

Details

In response to this:

/override ci/prow/e2e-aks
/override ci/prow/e2e-aws
/override ci/prow/e2e-aws-upgrade-hypershift-operator
/override ci/prow/e2e-azure-self-managed
/override ci/prow/e2e-kubevirt-aws-ovn-reduced
/override ci/prow/e2e-v2-aws

i just added a unit test to make codecov pass

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.

bryan-cox · 2026-03-29T00:41:56Z

/verified by conformance test passing before

openshift-ci-robot · 2026-03-29T00:42:07Z

@bryan-cox: This pull request references Jira Issue OCPBUGS-81284, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.22.0) matches configured target version for branch (4.22.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

What this PR does / why we need it:

Allow multiple machine-os versions in component version skew checks to support dual stream efforts. This mirrors the same change from openshift/oc#2157.

Two locations in support/releaseinfo/releaseinfo.go (readComponentVersions) updated to skip adding machine-os to the multiples error set, allowing multiple versions of the machine-os component without triggering a version skew error.

Which issue(s) this PR fixes:

Fixes OCPBUGS-81284

Special notes for your reviewer:

Requested by @ardaguclu in this review comment.

Checklist:

Subject and description added to both, commit and PR.

Relevant issues have been referenced.

This change includes docs.

This change includes unit tests.

Summary by CodeRabbit

Bug Fixes

Modified handling of duplicate component version entries, with machine-os components now processed separately from other component types during version aggregation.

Tests

Added unit tests for component version reading functionality, including scenarios with multiple version entries for different component types.

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 · 2026-03-29T00:42:08Z

@bryan-cox: This PR has been marked as verified by conformance test passing before.

Details

In response to this:

/verified by conformance test passing before

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.

Verify that multiple machine-os component versions do not produce an error, while multiple versions for other components still do. Signed-off-by: Bryan Cox <brcox@redhat.com> Commit-Message-Assisted-by: Claude (via Claude Code) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

openshift-ci-robot · 2026-03-29T00:53:38Z

@bryan-cox: This pull request references Jira Issue OCPBUGS-81284, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.22.0) matches configured target version for branch (4.22.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Details

In response to this:

What this PR does / why we need it:

Allow multiple machine-os versions in component version skew checks to support dual stream efforts. This mirrors the same change from openshift/oc#2157.

Two locations in support/releaseinfo/releaseinfo.go (readComponentVersions) updated to skip adding machine-os to the multiples error set, allowing multiple versions of the machine-os component without triggering a version skew error.

Which issue(s) this PR fixes:

Fixes OCPBUGS-81284

Special notes for your reviewer:

Requested by @ardaguclu in this review comment.

Checklist:

Subject and description added to both, commit and PR.

Relevant issues have been referenced.

This change includes docs.

This change includes unit tests.

Summary by CodeRabbit

Bug Fixes

Improved handling of duplicate component version entries so OS image versions are treated separately from other components during aggregation, reducing false error reports and ensuring OS versions are still reported when multiple values exist.

Tests

Added unit tests covering multiple-version scenarios for OS image and other components to validate aggregation and error reporting behavior.

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.

neisw · 2026-03-29T00:53:51Z

/lgtm

openshift-ci-robot · 2026-03-29T00:54:09Z

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws

bryan-cox · 2026-03-29T00:57:26Z

/override ci/prow/e2e-aks
/override ci/prow/e2e-aws
/override ci/prow/e2e-aws-upgrade-hypershift-operator
/override ci/prow/e2e-azure-self-managed
/override ci/prow/e2e-kubevirt-aws-ovn-reduced
/override ci/prow/e2e-v2-aws

openshift-ci · 2026-03-29T00:57:43Z

@bryan-cox: Overrode contexts on behalf of bryan-cox: ci/prow/e2e-aks, ci/prow/e2e-aws, ci/prow/e2e-aws-upgrade-hypershift-operator, ci/prow/e2e-azure-self-managed, ci/prow/e2e-kubevirt-aws-ovn-reduced, ci/prow/e2e-v2-aws

Details

In response to this:

/override ci/prow/e2e-aks
/override ci/prow/e2e-aws
/override ci/prow/e2e-aws-upgrade-hypershift-operator
/override ci/prow/e2e-azure-self-managed
/override ci/prow/e2e-kubevirt-aws-ovn-reduced
/override ci/prow/e2e-v2-aws

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.

bryan-cox · 2026-03-29T01:12:49Z

/verified by tests

openshift-ci-robot · 2026-03-29T01:13:01Z

@bryan-cox: This PR has been marked as verified by tests.

Details

In response to this:

/verified by tests

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 · 2026-03-29T01:19:11Z

@bryan-cox: Jira Issue Verification Checks: Jira Issue OCPBUGS-81284
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-81284 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

What this PR does / why we need it:

Allow multiple machine-os versions in component version skew checks to support dual stream efforts. This mirrors the same change from openshift/oc#2157.

Two locations in support/releaseinfo/releaseinfo.go (readComponentVersions) updated to skip adding machine-os to the multiples error set, allowing multiple versions of the machine-os component without triggering a version skew error.

Which issue(s) this PR fixes:

Fixes OCPBUGS-81284

Special notes for your reviewer:

Requested by @ardaguclu in this review comment.

Checklist:

Subject and description added to both, commit and PR.

Relevant issues have been referenced.

This change includes docs.

This change includes unit tests.

Summary by CodeRabbit

Bug Fixes

Improved handling of duplicate component version entries so OS image versions are treated separately from other components during aggregation, reducing false error reports and ensuring OS versions are still reported when multiple values exist.

Tests

Added unit tests covering multiple-version scenarios for OS image and other components to validate aggregation and error reporting behavior.

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 · 2026-03-29T01:19:23Z

@bryan-cox: 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-ci bot added the do-not-merge/needs-area label Mar 28, 2026

openshift-ci bot requested review from cblecker and csrwng March 28, 2026 20:31

openshift-ci bot added the area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release label Mar 28, 2026

openshift-ci bot added area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-area labels Mar 28, 2026

bryan-cox force-pushed the fix-hypershift-release branch from bd96512 to e43e3a4 Compare March 28, 2026 20:32

bryan-cox changed the title ~~fix(release): allow multiple machine-os component versions~~ OCPBUGS-81284: fix(release): allow multiple machine-os component versions Mar 28, 2026

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 28, 2026

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Mar 28, 2026

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 28, 2026

openshift-ci bot assigned neisw Mar 28, 2026

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 28, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 28, 2026

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 29, 2026

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 29, 2026

openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Mar 29, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 29, 2026

bryan-cox force-pushed the fix-hypershift-release branch from 3d344dc to 66e356c Compare March 29, 2026 00:51

openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Mar 29, 2026

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 29, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Mar 29, 2026

openshift-merge-bot bot merged commit 0ad27df into openshift:main Mar 29, 2026
29 checks passed

bryan-cox deleted the fix-hypershift-release branch March 29, 2026 01:20

Conversation

bryan-cox commented Mar 28, 2026 • edited by coderabbitai bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Checklist:

Summary by CodeRabbit

Uh oh!

openshift-ci-robot commented Mar 28, 2026

Uh oh!

coderabbitai bot commented Mar 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Uh oh!

openshift-ci bot commented Mar 28, 2026

Uh oh!

coderabbitai bot commented Mar 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review failed

Uh oh!

openshift-ci-robot commented Mar 28, 2026

Summary

Changes

Test plan

Summary by CodeRabbit

Uh oh!

bryan-cox commented Mar 28, 2026

Uh oh!

openshift-ci-robot commented Mar 28, 2026

Uh oh!

bryan-cox commented Mar 28, 2026

Uh oh!

openshift-ci-robot commented Mar 28, 2026

Uh oh!

bryan-cox commented Mar 28, 2026

Uh oh!

neisw commented Mar 28, 2026

Uh oh!

openshift-ci-robot commented Mar 28, 2026

Uh oh!

bryan-cox commented Mar 28, 2026

Uh oh!

openshift-ci-robot commented Mar 28, 2026

Uh oh!

neisw commented Mar 29, 2026

Uh oh!

cwbotbot commented Mar 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

e2e-aws

e2e-aks

Uh oh!

codecov bot commented Mar 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

bryan-cox commented Mar 29, 2026

Uh oh!

openshift-ci bot commented Mar 29, 2026

Uh oh!

bryan-cox commented Mar 29, 2026

Uh oh!

openshift-ci-robot commented Mar 29, 2026

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Checklist:

Summary by CodeRabbit

Uh oh!

openshift-ci-robot commented Mar 29, 2026

Uh oh!

openshift-ci-robot commented Mar 29, 2026

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Checklist:

Summary by CodeRabbit

Uh oh!

neisw commented Mar 29, 2026

bryan-cox commented Mar 28, 2026 •

edited by coderabbitai bot

Loading

coderabbitai bot commented Mar 28, 2026 •

edited

Loading

coderabbitai bot commented Mar 28, 2026 •

edited

Loading

cwbotbot commented Mar 29, 2026 •

edited

Loading

codecov bot commented Mar 29, 2026 •

edited

Loading