Skip to content

OCPNODE-4521: Use programmatic skip for single-node instead of test name tag - #31486

Open
saschagrunert wants to merge 1 commit into
openshift:mainfrom
saschagrunert:fix-additional-storage-shard
Open

OCPNODE-4521: Use programmatic skip for single-node instead of test name tag#31486
saschagrunert wants to merge 1 commit into
openshift:mainfrom
saschagrunert:fix-additional-storage-shard

Conversation

@saschagrunert

@saschagrunert saschagrunert commented Aug 5, 2026

Copy link
Copy Markdown
Member

Remove [Skipped:SingleReplicaTopology] from the Describe string and use a programmatic skip via IsSingleNode() in BeforeEach instead.

The tag in the test name changed the SHA-256 hash used for deterministic sharding (pkg/test/ginkgo/sharder.go), which moved the test from shard 2of2 to 1of2 and reset all Sippy run counts to zero. This blocks the feature gate promotion in openshift/api#2858.

This reverts the test name to its original form (from #31439) while preserving the single-node skip behavior.

Summary by CodeRabbit

  • Tests
    • Updated storage end-to-end test behavior for single-node clusters.
    • Tests now skip explicitly with a clear message when the required topology is unavailable.

…ame tag

Remove [Skipped:SingleReplicaTopology] from the Describe string and
use a programmatic skip via IsSingleNode() in BeforeEach instead.

The tag in the test name changed the SHA-256 hash used for
deterministic sharding, which moved the test from shard 2of2 to 1of2
and reset all Sippy run counts to zero.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
@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 Aug 5, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 5, 2026

Copy link
Copy Markdown

@saschagrunert: This pull request references OCPNODE-4521 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 story to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Remove [Skipped:SingleReplicaTopology] from the Describe string and use a
programmatic skip via IsSingleNode() in BeforeEach instead.

The tag in the test name changed the SHA-256 hash used for deterministic
sharding (pkg/test/ginkgo/sharder.go), which moved the test from shard 2of2
to 1of2 and reset all Sippy run counts to zero. This blocks the feature gate
promotion in openshift/api#2858.

This reverts the test name to its original form (from #31439)
while preserving the single-node skip 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.

@saschagrunert

Copy link
Copy Markdown
Member Author

@haircommander @mrunalp @rphillips @cpmeadors could one of you approve this? It unblocks the AdditionalStorageConfig feature gate promotion (openshift/api#2858).

@coderabbitai

coderabbitai Bot commented Aug 5, 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: 4fb49c20-b702-41d8-82df-81106236f2b5

📥 Commits

Reviewing files that changed from the base of the PR and between 4ccfabd and bec58d2.

📒 Files selected for processing (1)
  • test/extended/node/additional_storage_e2e.go

Walkthrough

The test replaces the Skipped:SingleReplicaTopology suite label with a BeforeEach check. It asserts cluster detection and skips single-node clusters with an explicit message.

Changes

Single-node test handling

Layer / File(s) Summary
Runtime cluster check
test/extended/node/additional_storage_e2e.go
The test detects single-node clusters before execution, verifies detection success, and skips when MCP rollouts are unreliable.

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

Suggested reviewers: bhargavigudi

🚥 Pre-merge checks | ✅ 14 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Test Structure And Quality ⚠️ Warning The new assertion at line 35 has no diagnostic message, and pod1 has no deferred cleanup if its startup assertion fails. Add a meaningful message to the IsSingleNode assertion and register DeferCleanup for pod1 before CreatePodAndWaitForRunning.
✅ 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 clearly describes replacing the test-name skip tag with a programmatic skip for single-node clusters.
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 The changed file has only two Ginkgo titles, both static string literals; no dynamic node, namespace, timestamp, UUID, IP, or generated identifier appears in a title.
Microshift Test Compatibility ✅ Passed The test retains [apigroup:config.openshift.io] and [apigroup:machineconfiguration.openshift.io] tags and calls SkipOnMicroShift before IsSingleNode, so MicroShift skips it.
Single Node Openshift (Sno) Test Compatibility ✅ Passed BeforeEach calls exutil.IsSingleNode and g.Skip before node and MCP operations, which is an explicitly allowed SNO protection.
Topology-Aware Scheduling Compatibility ✅ Passed The PR changes only one E2E test file and adds an IsSingleNode skip; it does not modify manifests, operators, controllers, or scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The diff adds only IsSingleNode and g.Skip inside BeforeEach; the changed file has no stdout/logging calls, and main writes warnings and errors to os.Stderr.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR adds no new Ginkgo test or network logic; it only changes skip handling. The existing public image dependency is unchanged and the test retains [Skipped:Disconnected].
No-Weak-Crypto ✅ Passed The complete PR diff only changes test metadata and single-node skip logic; it adds no weak crypto, custom crypto, or secret comparison.
Container-Privileges ✅ Passed The commit changes only one Go test file; added code has no privileged, hostPID/hostNetwork/hostIPC, SYS_ADMIN, or escalation settings, and its pod uses UID 1000 with escalation disabled.
No-Sensitive-Data-In-Logs ✅ Passed The PR adds only a static single-node skip message and topology check. It adds no logging; all existing framework.Logf calls are unchanged.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@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 Aug 5, 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

@cpmeadors

Copy link
Copy Markdown
Contributor

/approve
/lgtm

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

openshift-ci Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpmeadors, saschagrunert

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 Aug 5, 2026
@openshift-ci

openshift-ci Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

@saschagrunert: The following tests 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-csi bec58d2 link true /test e2e-gcp-csi
ci/prow/e2e-metal-ipi-ovn-ipv6 bec58d2 link true /test e2e-metal-ipi-ovn-ipv6
ci/prow/e2e-aws-csi bec58d2 link true /test e2e-aws-csi

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants