Skip to content

Force RHCOS 9 for FIPS nightly 5.0 jobs#80518

Closed
stbenjam wants to merge 1 commit into
openshift:mainfrom
stbenjam:fips-rhcos9
Closed

Force RHCOS 9 for FIPS nightly 5.0 jobs#80518
stbenjam wants to merge 1 commit into
openshift:mainfrom
stbenjam:fips-rhcos9

Conversation

@stbenjam

@stbenjam stbenjam commented Jun 15, 2026

Copy link
Copy Markdown
Member

Summary

  • Adds OS_IMAGE_STREAM: rhel-9 to three FIPS jobs on the 5.0 nightly payload to work around an RHCOS 10 FIPS bug
  • Affected jobs: e2e-aws-ovn-fips, e2e-aws-ovn-upgrade-fips (also drives the aggregated variant), e2e-aws-ovn-upgrade-fips-no-nat-instance
  • This sets osImageStream: rhel-9 in install-config.yaml so the installer uses RHCOS 9 boot images

Test plan

  • Verify the installer accepts osImageStream: rhel-9 without FEATURE_SET: TechPreviewNoUpgrade (all existing usage of this field pairs it with TechPreview — this is the first attempt without it)
  • Monitor next nightly payload run for the FIPS jobs to confirm they install successfully with RHCOS 9
  • Once the RHCOS 10 FIPS bug is fixed, revert this change

🤖 Generated with Claude Code

Summary by CodeRabbit

This PR modifies the OpenShift 5.0 nightly payload CI configuration to work around a RHCOS 10 FIPS implementation bug. Specifically, it adds OS_IMAGE_STREAM: rhel-9 environment variable configuration to three AWS-based FIPS test jobs in the nightly pipeline:

  • e2e-aws-ovn-fips
  • e2e-aws-ovn-upgrade-fips (and its aggregated variant)
  • e2e-aws-ovn-upgrade-fips-no-nat-instance

The change directs the OpenShift installer to use RHCOS 9 boot images instead of the default RHCOS 10 for these FIPS-specific test jobs. This is a temporary workaround while the underlying RHCOS 10 FIPS bug is resolved.

The modification is applied to ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml and represents the first usage of the osImageStream field without requiring the FEATURE_SET: TechPreviewNoUpgrade flag, establishing a precedent for future non-preview use cases.

@coderabbitai

coderabbitai Bot commented Jun 15, 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: 594e413e-ac5a-487f-ad62-3bb83884942a

📥 Commits

Reviewing files that changed from the base of the PR and between 495b0be and a0c6513.

📒 Files selected for processing (1)
  • ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml

Walkthrough

Five FIPS-related CI test job definitions in openshift-release-main__nightly-5.0.yaml are updated to add OS_IMAGE_STREAM: rhel-9 to their steps.env blocks: e2e-aws-ovn-fips, e2e-aws-ovn-upgrade-fips, e2e-aws-ovn-upgrade-fips-no-nat-instance, e2e-gcp-ovn-fips, and e2e-aws-ovn-fips-serial.

Changes

FIPS test jobs OS image stream configuration

Layer / File(s) Summary
OS_IMAGE_STREAM added to five FIPS test jobs
ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml
OS_IMAGE_STREAM: rhel-9 is added to the steps.env block of e2e-aws-ovn-fips, e2e-aws-ovn-upgrade-fips, e2e-aws-ovn-upgrade-fips-no-nat-instance, e2e-gcp-ovn-fips, and e2e-aws-ovn-fips-serial jobs.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately describes the main change: adding RHCOS 9 configuration to FIPS nightly 5.0 jobs as a workaround.
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 PR modifies only CI/CD YAML configuration file, not test code; no Ginkgo test names present to evaluate against stability requirements.
Test Structure And Quality ✅ Passed PR modifies only YAML CI configuration files, not Ginkgo test code; the check for Ginkgo test quality is not applicable to this PR.
Microshift Test Compatibility ✅ Passed The check applies only to new Ginkgo e2e tests, but this PR modifies only CI configuration (YAML), adding environment variables to existing jobs with no new test code.
Single Node Openshift (Sno) Test Compatibility ✅ Passed This PR modifies only YAML CI configuration, not adding any new Ginkgo e2e tests. The SNO compatibility check applies only to new test code and is not applicable here.
Topology-Aware Scheduling Compatibility ✅ Passed This PR modifies only CI/CD test job configuration (environment variables for test infrastructure), not deployment manifests, operator code, or controllers. The check for topology-aware scheduling...
Ote Binary Stdout Contract ✅ Passed PR only modifies CI job configuration YAML file; does not change any test binary source code, so OTE Binary Stdout Contract check is not applicable.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests added. PR only modifies CI configuration YAML with environment variables for existing test jobs.
No-Weak-Crypto ✅ Passed PR modifies only a YAML configuration file with environment variables for CI jobs. No cryptographic code, weak crypto algorithms (MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB), custom crypto implementa...
Container-Privileges ✅ Passed This PR modifies a CI operator configuration file, not a Kubernetes/container manifest. The file contains only job definitions with environment variables (OS_IMAGE_STREAM: rhel-9), no container sec...
No-Sensitive-Data-In-Logs ✅ Passed The PR only adds OS_IMAGE_STREAM: rhel-9 environment variables to YAML test job configurations. These are non-sensitive operational parameters with no logging statements, passwords, tokens, API key...

✏️ 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 commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: stbenjam

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 15, 2026
@openshift-ci openshift-ci Bot requested review from sosiouxme and xueqzhan June 15, 2026 11:13
…solved

Adds OS_IMAGE_STREAM: rhel-9 to all FIPS jobs on the 5.0 nightly
payload so they install with RHCOS 9 instead of the default RHCOS 10:

- e2e-aws-ovn-fips
- e2e-aws-ovn-fips-serial
- e2e-aws-ovn-upgrade-fips (also drives aggregated-aws-ovn-upgrade-5.0-micro-fips)
- e2e-aws-ovn-upgrade-fips-no-nat-instance
- e2e-gcp-ovn-fips

Skipped: fips-payload-scan (not a cluster install), and
e2e-gcp-ovn-rhcos10-fips-techpreview-serial (intentionally tests RHCOS 10).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

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

🧹 Nitpick comments (1)
ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml (1)

1456-1541: ⚡ Quick win

Verify tracking mechanism for temporary workaround.

Since this is a temporary workaround for the RHCOS 10 FIPS bug (per PR objectives), ensure there's a tracking mechanism (e.g., linked bug/issue) to remember to revert these changes once the upstream bug is fixed.

🤖 Prompt for 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.

In
`@ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml`
around lines 1456 - 1541, The changes to the test configurations
(e2e-aws-ovn-upgrade-fips-rhcos9-10-techpreview and related FIPS test cases)
represent a temporary workaround for the RHCOS 10 FIPS bug. Ensure there is a
linked bug or issue that tracks this temporary workaround and serves as a
reminder to revert these changes once the upstream bug is fixed. Add a comment
or reference in the configuration file or commit message that documents the
associated bug/issue tracking number so the team knows when and why to remove
these temporary modifications.
🤖 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.

Nitpick comments:
In
`@ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml`:
- Around line 1456-1541: The changes to the test configurations
(e2e-aws-ovn-upgrade-fips-rhcos9-10-techpreview and related FIPS test cases)
represent a temporary workaround for the RHCOS 10 FIPS bug. Ensure there is a
linked bug or issue that tracks this temporary workaround and serves as a
reminder to revert these changes once the upstream bug is fixed. Add a comment
or reference in the configuration file or commit message that documents the
associated bug/issue tracking number so the team knows when and why to remove
these temporary modifications.

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 1dba0767-3b28-41c4-af52-a13e38236c44

📥 Commits

Reviewing files that changed from the base of the PR and between 2c4f316 and 495b0be.

📒 Files selected for processing (1)
  • ci-operator/config/openshift/release/openshift-release-main__nightly-5.0.yaml

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@stbenjam: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
periodic-ci-openshift-release-main-nightly-5.0-e2e-aws-ovn-upgrade-fips-no-nat-instance N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-gcp-ovn-fips N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-aws-ovn-fips N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-aws-ovn-fips-serial N/A periodic Ci-operator config changed
periodic-ci-openshift-release-main-nightly-5.0-e2e-aws-ovn-upgrade-fips N/A periodic Ci-operator config changed
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 15, 2026

Copy link
Copy Markdown
Contributor

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

@stbenjam stbenjam closed this Jun 15, 2026
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant