Skip to content

Use e2eskipper.Skipf to disable os version test until RHEL-10 switchover#31297

Merged
stbenjam merged 2 commits into
openshift:mainfrom
not-stbenjam:fix-xit-skip-v2
Jun 12, 2026
Merged

Use e2eskipper.Skipf to disable os version test until RHEL-10 switchover#31297
stbenjam merged 2 commits into
openshift:mainfrom
not-stbenjam:fix-xit-skip-v2

Conversation

@not-stbenjam

@not-stbenjam not-stbenjam commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Based on top of the revert in #31295.

Adds e2eskipper.Skipf at the top of the "should match os version" test so it is properly reported as skipped rather than silently excluded via XIt. The test remains disabled pending the RHEL-10 switchover (MCO-2371).

Depends on: #31295

Summary by CodeRabbit

  • Tests
    • Adjusted OS version validation test to temporarily skip pending RHEL-10 compatibility updates.

Chai Bot and others added 2 commits June 12, 2026 00:37
This reverts commit bde16f5, reversing
changes made to af43b92.
Add e2eskipper.Skipf at the top of the test so it is properly reported
as skipped rather than silently excluded via XIt. The test remains
disabled pending the RHEL-10 switchover (MCO-2371).

See: https://redhat.atlassian.net/browse/MCO-2371
@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 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 Jun 12, 2026
@coderabbitai

coderabbitai Bot commented Jun 12, 2026

Copy link
Copy Markdown

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: 23001368-48f5-4e1e-9dc6-ae09bc5a5a2a

📥 Commits

Reviewing files that changed from the base of the PR and between bde16f5 and f02f263.

📒 Files selected for processing (1)
  • test/extended/ci/job_names.go

Walkthrough

The CI prow job name specification test for OS version matching is converted from a pending/disabled test to an enabled test that immediately skips at runtime, with a temporary disabling message referencing the RHEL-10 switchover (MCO-2371).

Changes

Test Runtime Skip

Layer / File(s) Summary
Enable OS version test with temporary runtime skip
test/extended/ci/job_names.go
The "should match os version" Ginkgo test is converted from disabled (g.XIt) to enabled (g.It) but immediately calls e2eskipper.Skipf with a message stating the check is temporarily disabled until the RHEL-10 switchover, while preserving the TODO comment reference.

🎯 1 (Trivial) | ⏱️ ~3 minutes

Possibly related PRs

  • openshift/origin#31287: Updates the same "should match os version" test in test/extended/ci/job_names.go with test registration and skip logic.

Suggested labels

jira/valid-reference

Suggested reviewers

  • deads2k
  • sjenning
🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Test Structure And Quality ⚠️ Warning “should match os version” still has cluster calls using context.TODO() and assertions like o.Expect(err).NotTo(o.HaveOccurred()) without messages (e.g., after IsMicroShift/IsHypershift). Add meaningful messages to all o.Expect(err).NotTo(o.HaveOccurred()) assertions, and wrap cluster Get/List calls (MCP/OSImageStream/Nodes) with context.WithTimeout.
✅ Passed checks (14 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title directly describes the main change: replacing XIt with e2eskipper.Skipf to properly disable a test with visibility until RHEL-10 switchover, which aligns with the changeset.
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 In test/extended/ci/job_names.go, all Ginkgo It titles use static string literals; the “should match os version” test title is unchanged and contains no dynamic values.
Microshift Test Compatibility ✅ Passed “should match os version” now starts with e2eskipper.Skipf (unconditionally skips). It also checks exutil.IsMicroShiftCluster and calls e2eskipper.Skip (alias of ginkgo.Skip) before any MicroShift-...
Single Node Openshift (Sno) Test Compatibility ✅ Passed The only changed Ginkgo test (“should match os version”) is unconditionally skipped at runtime via e2eskipper.Skipf before any multi-node/HA assertions execute.
Topology-Aware Scheduling Compatibility ✅ Passed PR changes only the CI test in test/extended/ci/job_names.go, adding e2eskipper.Skipf to skip the “should match os version” check; no scheduling constraints/topology logic/manifests were modified.
Ote Binary Stdout Contract ✅ Passed In test/extended/ci/job_names.go, the 'should match os version' test skips via e2eskipper.Skipf inside g.It; no fmt.Print/klog/os.Stdout/log.SetOutput in main/init/TestMain or top-level initializers.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR only adds e2eskipper.Skipf to the existing "should match os version" test; the file has no hardcoded IPv4 literals/IPv4-only parsing or public-internet/disconnected network access.
No-Weak-Crypto ✅ Passed PR only updates test/extended/ci/job_names.go to add e2eskipper.Skipf; scanning the file shows no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB and no crypto imports or secret/token comparisons.
Container-Privileges ✅ Passed PR #31297 changes only test/extended/ci/job_names.go (adds e2eskipper.Skipf); no container/K8s manifests or privileged/securityContext settings (hostPID/hostNetwork/hostIPC, SYS_ADMIN, allowPrivile...
No-Sensitive-Data-In-Logs ✅ Passed job_names.go diff only changes g.XIt→g.It and adds e2eskipper.Skipf("Temporarily disabled... MCO-2371"); no new password/token/PII or internal-hostname logging introduced.

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

✨ 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 and usage tips.

@openshift-ci openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 12, 2026
@openshift-ci

openshift-ci Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Hi @not-stbenjam. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Tip

We noticed you've done this a few times! Consider joining the org to skip this step and gain /lgtm and other bot rights. We recommend asking approvers on your previous PRs to sponsor you.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@stbenjam

Copy link
Copy Markdown
Member

/ok-to-test
/approve

(Automated: Extending self-approval rights and ok-to-test to my bot account.)

@openshift-ci openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 12, 2026
@openshift-ci openshift-ci Bot requested review from deads2k and sjenning June 12, 2026 01:05
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 12, 2026
@stbenjam

Copy link
Copy Markdown
Member

/pipeline required

@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

@zaneb

zaneb commented Jun 12, 2026

Copy link
Copy Markdown
Member

/lgtm

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

openshift-ci Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: not-stbenjam, stbenjam, zaneb

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

@sdodson sdodson added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 12, 2026
@openshift-ci

openshift-ci Bot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

@not-stbenjam: 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-aws-ovn-fips f02f263 link true /test e2e-aws-ovn-fips

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.

@stbenjam

Copy link
Copy Markdown
Member

/verified by CI

@stbenjam stbenjam merged commit 710a45d into openshift:main Jun 12, 2026
19 of 21 checks passed
@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 12, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@stbenjam: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI

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.

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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

5 participants