STOR-3090: Select ocp-manifest vs ocp-manifest-long with fallback for older releases by radeore · Pull Request #84414 · openshift/release

radeore · 2026-09-01T20:00:08Z

Summary

Follow-up to #83463 / revert #84395.

#83463 copied ocp-manifest-long.yaml whenever ENABLE_LONG_CSI_CERTIFICATION_TESTS=true. That file exists only after openshift/csi-operator#596. Payload jobs such as periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-csi set the long flag, so storage-conf-csi-aws-ebs failed with:
cp: cannot stat 'test/e2e/aws-ebs/ocp-manifest-long.yaml': No such file or directory

The step-registry is shared across releases. This change keeps the split, but only copies a file that is present:

Long jobs (ENABLE_LONG_CSI_CERTIFICATION_TESTS=true): copy ocp-manifest-long.yaml if it exists, otherwise the combined ocp-manifest.yaml.
Short jobs: copy standard ocp-manifest.yaml only when the split is present (ocp-manifest-long.yaml exists).

Applies to AWS EBS, Azure Disk, Azure File, GCP PD, and AWS EFS.

Summary by CodeRabbit

This PR updates CSI certification test manifest selection for AWS EBS, Azure Disk, Azure File, GCP PD, and AWS EFS.

Long jobs use ocp-manifest-long.yaml when available.
Long jobs fall back to ocp-manifest.yaml for older releases.
Short jobs use ocp-manifest.yaml only when the split manifests exist.
Scripts display the manifest only after copying it successfully.

These changes prevent failures from shared step-registry configuration across releases that do not provide ocp-manifest-long.yaml.

… older releases

openshift-ci-robot · 2026-09-01T20:00:14Z

@radeore: This pull request references STOR-3090 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 sub-task to target the "5.1.0" version, but no target version was set.

Details

In response to this:

Summary

Follow-up to #83463 / revert #84395.

#83463 copied ocp-manifest-long.yaml whenever ENABLE_LONG_CSI_CERTIFICATION_TESTS=true. That file exists only after openshift/csi-operator#596. Payload jobs such as periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-csi set the long flag, so storage-conf-csi-aws-ebs failed with:
cp: cannot stat 'test/e2e/aws-ebs/ocp-manifest-long.yaml': No such file or directory

The step-registry is shared across releases. This change keeps the split, but only copies a file that is present:

Long jobs (ENABLE_LONG_CSI_CERTIFICATION_TESTS=true): copy ocp-manifest-long.yaml if it exists, otherwise the combined ocp-manifest.yaml.

Short jobs: copy standard ocp-manifest.yaml only when the split is present (ocp-manifest-long.yaml exists).

Applies to AWS EBS, Azure Disk, Azure File, GCP PD, and AWS EFS.

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 · 2026-09-01T20:00:56Z

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: Team

Run ID: 0ff919b6-7bd9-4667-809f-5aef7e216197

📥 Commits

Reviewing files that changed from the base of the PR and between dd937d0 and ec47591.

📒 Files selected for processing (5)

ci-operator/step-registry/storage/conf/csi-aws-ebs/storage-conf-csi-aws-ebs-commands.sh
ci-operator/step-registry/storage/conf/csi-azure-disk/storage-conf-csi-azure-disk-commands.sh
ci-operator/step-registry/storage/conf/csi-azure-file/storage-conf-csi-azure-file-commands.sh
ci-operator/step-registry/storage/conf/csi-gcp-pd/storage-conf-csi-gcp-pd-commands.sh
ci-operator/step-registry/storage/create/csi-aws-efs/storage-create-csi-aws-efs-commands.sh

Included review availability: Your plan provides up to 2 included reviews per hour; 1 remains after this review.

Walkthrough

The CSI storage scripts now select long or standard OCP manifests based on certification mode and file availability. Manifest output occurs only when the destination file exists.

Changes

OCP CSI manifest handling

Layer / File(s)	Summary
Manifest selection and reporting `ci-operator/step-registry/storage/conf/csi-aws-ebs/...`, `ci-operator/step-registry/storage/conf/csi-azure-disk/...`, `ci-operator/step-registry/storage/conf/csi-azure-file/...`, `ci-operator/step-registry/storage/conf/csi-gcp-pd/...`, `ci-operator/step-registry/storage/create/csi-aws-efs/...`	The scripts process manifests when `TEST_OCP_CSI_DRIVER_MANIFEST` is set. Long certification tests prefer `ocp-manifest-long.yaml` and fall back to `ocp-manifest.yaml`. Other tests copy the standard manifest when both files exist. The scripts display the copied manifest only when the destination exists.

Estimated code review effort: 2 (Simple) | ~15 minutes

Merge Risk: ⚪ Minimal · up to ec475

The change adds release-aware fallback selection for storage manifests without any identified merge-blocking risk; it is merge-ready after normal checks and review.

Suggested reviewers: jsafrane

🚥 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 clearly and concisely describes the main change: selecting between ocp-manifest.yaml and ocp-manifest-long.yaml with a fallback for older releases.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 5…
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	PASS: The pull request changes five `.sh` step-registry scripts only. The diff contains manifest copy and display logic, with no Ginkgo test declarations or test-title construction. Therefore, it intr…
Test Structure And Quality	✅ Passed	PASS: The pull request changes only five shell command files. The diff contains no Ginkgo or Gomega test code and no changed test paths. Therefore, the Ginkgo-specific requirements are not applicable.
Microshift Test Compatibility	✅ Passed	PASS — The pull request changes only five shell command files that select and copy CSI manifests. The diff adds no Ginkgo e2e tests and no It(), Describe(), Context(), or When() declarations. Therefor…
Single Node Openshift (Sno) Test Compatibility	✅ Passed	PASS: The pull request changes only five shell manifest-selection scripts. The exact HEAD^..HEAD diff contains no Go files, test files, or Ginkgo declarations such as It(), Describe(), Context(), or W…
Topology-Aware Scheduling Compatibility	✅ Passed	PASS: The pull request changes only five `.sh` step-registry files. The diff adds manifest file-existence checks and copy selection logic. It adds no anti-affinity, topology spread, replica, node-sele…
Ote Binary Stdout Contract	✅ Passed	PASS: The pull request changes only five shell step-registry files. The diff contains no Go files, OTE binary code, or process-level functions such as main(), TestMain(), BeforeSuite(), or RunSpecs() …
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PASS: The pull request changes only five shell step-registry scripts. The committed diff adds no Ginkgo e2e tests, test declarations, IPv4 addresses, or external connectivity calls. The custom check i…
No-Weak-Crypto	✅ Passed	PASS: The pull-request diff changes only manifest file selection and copying in five shell scripts. The added code uses file tests, `cp`, `echo`, and `cat`; it introduces no MD5, SHA1, DES, 3DES, RC4,…
Container-Privileges	✅ Passed	PASS. The pull request changes only five shell scripts that select and copy CSI manifest files. The added lines contain no `privileged`, `hostPID`, `hostNetwork`, `hostIPC`, `SYS_ADMIN`, `allowPrivile…
No-Sensitive-Data-In-Logs	✅ Passed	PASS. The changed logging prints only selected OCP test manifests and their shared-directory paths. The manifests at the referenced CSI operator split commit contain driver names, test capability flag…

Full details: Docstring Coverage

Explanation

No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 5 files.

Full details: Stable And Deterministic Test Names

Explanation

PASS: The pull request changes five .sh step-registry scripts only. The diff contains manifest copy and display logic, with no Ginkgo test declarations or test-title construction. Therefore, it introduces no unstable or overly-specific Ginkgo test names.

Full details: Microshift Test Compatibility

Explanation

PASS — The pull request changes only five shell command files that select and copy CSI manifests. The diff adds no Ginkgo e2e tests and no It(), Describe(), Context(), or When() declarations. Therefore the MicroShift Test Compatibility check is not applicable.

Full details: Single Node Openshift (Sno) Test Compatibility

Explanation

PASS: The pull request changes only five shell manifest-selection scripts. The exact HEAD^..HEAD diff contains no Go files, test files, or Ginkgo declarations such as It(), Describe(), Context(), or When(). Therefore the SNO test compatibility check is not applicable.

Full details: Topology-Aware Scheduling Compatibility

Explanation

PASS: The pull request changes only five .sh step-registry files. The diff adds manifest file-existence checks and copy selection logic. It adds no anti-affinity, topology spread, replica, node-selector, toleration, or PDB configuration. No deployment manifest, operator code, or controller is added or modified. The existing EFS worker-node lookup is unchanged.

Full details: Ote Binary Stdout Contract

Explanation

PASS: The pull request changes only five shell step-registry files. The diff contains no Go files, OTE binary code, or process-level functions such as main(), TestMain(), BeforeSuite(), or RunSpecs() setup. The added echo and cat commands are shell-step output, not stdout writes from an OTE binary.

Full details: Ipv6 And Disconnected Network Test Compatibility

Explanation

PASS: The pull request changes only five shell step-registry scripts. The committed diff adds no Ginkgo e2e tests, test declarations, IPv4 addresses, or external connectivity calls. The custom check is therefore not applicable.

Full details: No-Weak-Crypto

Explanation

PASS: The pull-request diff changes only manifest file selection and copying in five shell scripts. The added code uses file tests, cp, echo, and cat; it introduces no MD5, SHA1, DES, 3DES, RC4, Blowfish, ECB, custom cryptography, or secret/token comparisons.

Full details: Container-Privileges

Explanation

PASS. The pull request changes only five shell scripts that select and copy CSI manifest files. The added lines contain no privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, allowPrivilegeEscalation, or root/security-context settings. The EFS ClusterCSIDriver object remains limited to managementState: Managed; no listed privilege field was added or changed.

Full details: No-Sensitive-Data-In-Logs

Explanation

PASS. The changed logging prints only selected OCP test manifests and their shared-directory paths. The manifests at the referenced CSI operator split commit contain driver names, test capability flags, pod counts, and timeouts; they contain no passwords, tokens, API keys, PII, session IDs, customer data, or hostnames. The manifest path values are fixed CI filenames such as ocp-manifest-aws-ebs.yaml, not secrets. Existing logging of the regular CSI manifest is unchanged.

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

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

openshift-merge-bot · 2026-09-01T20:04:18Z

[REHEARSALNOTIFIER]
@radeore: 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
pull-ci-openshift-csi-node-driver-registrar-master-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-5.2-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-5.1-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-5.0-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.23-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.22-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.21-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.20-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.19-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.18-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.17-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.16-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.15-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.14-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.13-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.12-e2e-aws-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-master-e2e-gcp-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-5.2-e2e-gcp-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-5.1-e2e-gcp-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-5.0-e2e-gcp-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.23-e2e-gcp-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.22-e2e-gcp-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.21-e2e-gcp-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.20-e2e-gcp-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed
pull-ci-openshift-csi-node-driver-registrar-release-4.19-e2e-gcp-csi	openshift/csi-node-driver-registrar	presubmit	Registry content changed

A total of 929 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs.

A full list of affected jobs can be found here
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

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.

gnufied · 2026-09-01T20:23:57Z

/pj-rehearse pull-ci-openshift-csi-node-driver-registrar-master-e2e-aws-csi

openshift-merge-bot · 2026-09-01T20:24:02Z

@gnufied: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

jsafrane · 2026-09-02T08:23:41Z

/pj-rehearse pull-ci-openshift-csi-operator-release-5.0-e2e-aws-csi pull-ci-openshift-csi-operator-release-5.0-e2e-azure-file-csi periodic-ci-openshift-release-main-nightly-4.22-e2e-aws-csi

openshift-merge-bot · 2026-09-02T08:27:28Z

@jsafrane: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

jsafrane · 2026-09-02T11:07:58Z

/lgtm
/approve
/pj-rehearse ack

openshift-ci · 2026-09-02T11:08:56Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, radeore

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:

~~ci-operator/step-registry/storage/OWNERS~~ [jsafrane]

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 · 2026-09-02T11:09:06Z

@jsafrane: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

openshift-ci · 2026-09-02T11:32:49Z

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

STOR-3090: Select ocp-manifest vs ocp-manifest-long with fallback for…

ec47591

… older releases

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 1, 2026

openshift-ci Bot requested review from RomanBednar and dobsonj September 1, 2026 20:02

openshift-ci Bot assigned jsafrane Sep 2, 2026

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

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 2, 2026

openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Sep 2, 2026

openshift-merge-bot Bot merged commit 20911d5 into openshift:main Sep 2, 2026
14 checks passed

Navigation Menu

Uh oh!

STOR-3090: Select ocp-manifest vs ocp-manifest-long with fallback for older releases - #84414

STOR-3090: Select ocp-manifest vs ocp-manifest-long with fallback for older releases#84414
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
radeore:manifest-split

radeore commented Sep 1, 2026 •

edited by coderabbitai Bot

Loading

Uh oh!

openshift-ci-robot commented Sep 1, 2026 •

edited by atlassian Bot

Loading

Summary

Uh oh!

coderabbitai Bot commented Sep 1, 2026 •

edited

Loading

Uh oh!

openshift-merge-bot Bot commented Sep 1, 2026

Uh oh!

gnufied commented Sep 1, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 1, 2026

Uh oh!

jsafrane commented Sep 2, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 2, 2026

Uh oh!

jsafrane commented Sep 2, 2026

Uh oh!

openshift-ci Bot commented Sep 2, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 2, 2026

Uh oh!

openshift-ci Bot commented Sep 2, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Uh oh!

Conversation

radeore commented Sep 1, 2026 • edited by coderabbitai Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Summary by CodeRabbit

Uh oh!

openshift-ci-robot commented Sep 1, 2026 • edited by atlassian Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Uh oh!

coderabbitai Bot commented Sep 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Uh oh!

openshift-merge-bot Bot commented Sep 1, 2026

Uh oh!

gnufied commented Sep 1, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 1, 2026

Uh oh!

jsafrane commented Sep 2, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 2, 2026

Uh oh!

jsafrane commented Sep 2, 2026

Uh oh!

openshift-ci Bot commented Sep 2, 2026

Uh oh!

openshift-merge-bot Bot commented Sep 2, 2026

Uh oh!

openshift-ci Bot commented Sep 2, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

radeore commented Sep 1, 2026 •

edited by coderabbitai Bot

Loading

openshift-ci-robot commented Sep 1, 2026 •

edited by atlassian Bot

Loading

coderabbitai Bot commented Sep 1, 2026 •

edited

Loading