Skip to content

OCPBUGS-86328: if rhcos9-10 in the job name,update jobname test#31198

Open
miyadav wants to merge 1 commit into
openshift:mainfrom
miyadav:fixosversionmatch
Open

OCPBUGS-86328: if rhcos9-10 in the job name,update jobname test#31198
miyadav wants to merge 1 commit into
openshift:mainfrom
miyadav:fixosversionmatch

Conversation

@miyadav
Copy link
Copy Markdown
Member

@miyadav miyadav commented May 20, 2026

@dgoodwin @petr-muller PTAL when time permits .

updating the jobname check spec for 9-10 mix upgrade job.
more context

Summary by CodeRabbit

  • Tests
    • CI job-name validation now detects mixed RHCOS 9→10 clusters and skips strict literal-version checks for those mixed cases.
    • Detects when both RHCOS 9 and 10 nodes exist, logs success, and returns early to avoid inappropriate failures.
    • Improved OS version detection: prefers pool-specific settings and falls back to cluster defaults when needed.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

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: automatic mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label May 20, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@miyadav: This pull request explicitly references no jira issue.

Details

In response to this:

@dgoodwin @petr-muller PTAL when time permits .

Skipping the jobname check spec for 9-10 mix upgrade job.
more context

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.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 20, 2026

Walkthrough

The CI job-name test now recognizes a "rhcos9-10" marker, checks for both RHCOS 9 and 10 nodes when present, logs and returns early on success, and extends RHCOS detection helpers to handle missing OSImageStream singletons explicitly.

Changes

RHCOS 9-to-10 upgrade job name handling

Layer / File(s) Summary
RHCOS detection helpers
test/extended/ci/job_names.go
Add/modify helpers: isMCPRHCOS10 checks MCP.OSImageStream with explicit NotFound fallback to return false; add hasMixedRHCOSNodes that lists nodes and detects CoreOS 9. and CoreOS 10. in node OSImage strings.
Detect rhcos9-10 marker
test/extended/ci/job_names.go
Compute jobIsMixedRHCOSVer from whether the trimmed JOB_NAME contains the rhcos9-10 marker.
MCP-specific mixed-RHCOS validation and early return
test/extended/ci/job_names.go
When the mixed marker is present, check for both RHCOS 9 and 10 nodes using hasMixedRHCOSNodes, fail if either is missing, log both results, and return early to avoid later rhcos10 substring assertions.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

🚥 Pre-merge checks | ✅ 10 | ❌ 2

❌ Failed checks (2 warnings)

Check name Status Explanation Resolution
Test Structure And Quality ⚠️ Warning New helper functions use context.TODO() without timeouts on cluster API operations (MachineConfigPool.Get, OSImageStream.Get, Nodes.List) that can hang indefinitely. Replace context.TODO() with context.WithTimeout() in isRHCOS10() and hasMixedRHCOSNodes() functions to protect against indefinite hangs on unresponsive API servers.
Single Node Openshift (Sno) Test Compatibility ⚠️ Warning New hasMixedRHCOSNodes() function requires both CoreOS 9 and 10 nodes—multi-node assumption. SNO has single node only and will fail when rhcos9-10 is in job name. Add [Skipped:SingleReplicaTopology] label to test name, or guard hasMixedRHCOSNodes with exutil.IsSingleNode() skip when true.
✅ Passed checks (10 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%.
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 All Ginkgo test names are static string literals with no dynamic content, timestamps, UUIDs, node/pod names, or other runtime-dependent values. Six It() tests use stable descriptive names.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; only an existing test was modified. The modified "should match os version" test already has proper MicroShift protection via IsMicroShiftCluster() check with skip.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies only test code (test/extended/ci/job_names.go), not deployment manifests, operator code, or controllers. No scheduling constraints are introduced.
Ote Binary Stdout Contract ✅ Passed New code uses e2e.Logf() and o.Expect() within test blocks (g.It), not at process level. No main(), init(), or process-level code added. All output respects test context boundaries.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; only existing test modified. The code contains no IPv4 assumptions, hardcoded IPv4 addresses, external connectivity requirements, or IPv6-incompatible patterns.
Title check ✅ Passed The title references the job name change for rhcos9-10 marker detection, which aligns with the main change: updating the test to skip jobname validation when 'rhcos9-10' is detected.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ 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 openshift-ci Bot requested review from p0lyn0mial and sjenning May 20, 2026 08:08
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 20, 2026
@openshift-ci openshift-ci Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label May 20, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

Comment thread test/extended/ci/job_names.go Outdated
Comment thread test/extended/ci/job_names.go Outdated
Comment thread test/extended/ci/job_names.go Outdated
@miyadav miyadav force-pushed the fixosversionmatch branch from 0efe158 to a4c6895 Compare May 20, 2026 12:01
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

@miyadav miyadav force-pushed the fixosversionmatch branch from a4c6895 to f1ad172 Compare May 20, 2026 16:56
@miyadav miyadav force-pushed the fixosversionmatch branch from f1ad172 to 6920296 Compare May 20, 2026 17:08
@dgoodwin
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label May 20, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 20, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dgoodwin, miyadav

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-merge-bot
Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

@miyadav
Copy link
Copy Markdown
Member Author

miyadav commented May 21, 2026

/test e2e-aws-ovn-serial-2of2

@dgoodwin
Copy link
Copy Markdown
Contributor

@miyadav use /payload-job with one of the job names this test is permafailing on. Then you can pre-merge verify the pr.

@dgoodwin
Copy link
Copy Markdown
Contributor

a jira might be a good idea, we may soon need something to triage these too once rhcos9-10 appears in the view.

@miyadav miyadav changed the title No-Jira: if rhcos9-10 in the job name,skip jobname test OCPBUGS-86328: if rhcos9-10 in the job name,skip jobname test May 21, 2026
@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label May 21, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@miyadav: This pull request references Jira Issue OCPBUGS-86328, which is invalid:

  • expected the bug to target the "5.0.0" version, but no target version was set

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:

@dgoodwin @petr-muller PTAL when time permits .

Skipping the jobname check spec for 9-10 mix upgrade job.
more context

Summary by CodeRabbit

  • Tests
  • CI job-name validation now detects mixed RHCOS 9→10 clusters and skips strict literal-version checks for those mixed cases.
  • Detects when both RHCOS 9 and 10 nodes exist, logs success, and returns early to avoid inappropriate failures.
  • Improved OS version detection: prefers pool-specific settings and falls back to cluster defaults when needed.

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.

@miyadav
Copy link
Copy Markdown
Member Author

miyadav commented May 21, 2026

/payload-job periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-upgrade-rhcos9-10-techpreview

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 21, 2026

@miyadav: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-release-main-nightly-5.0-e2e-metal-ipi-ovn-upgrade-rhcos9-10-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/e0b3d120-550e-11f1-8396-1690979505f0-0

@miyadav miyadav changed the title OCPBUGS-86328: if rhcos9-10 in the job name,skip jobname test OCPBUGS-86328: if rhcos9-10 in the job name,update jobname test May 21, 2026
@miyadav
Copy link
Copy Markdown
Member Author

miyadav commented May 21, 2026

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown

@miyadav: This pull request references Jira Issue OCPBUGS-86328, which is invalid:

  • expected the bug to target the "5.0.0" version, but no target version was set

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.

@miyadav
Copy link
Copy Markdown
Member Author

miyadav commented May 22, 2026

/label verified by payload-job

@miyadav
Copy link
Copy Markdown
Member Author

miyadav commented May 22, 2026

/verified by payload-job

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label May 22, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@miyadav: This PR has been marked as verified by payload-job.

Details

In response to this:

/verified by payload-job

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.

@dgoodwin
Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot 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 May 22, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@dgoodwin: This pull request references Jira Issue OCPBUGS-86328, 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 (5.0.0) matches configured target version for branch (5.0.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.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

Scheduling required tests:
/test e2e-aws-csi
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 22, 2026

@miyadav: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-gcp-ovn 6920296 link true /test e2e-gcp-ovn

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.

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-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. 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. ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants