Skip to content

OCPBUGS-86041: update IsSNO helper function to correctly access the cluster's topology#6110

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
isabella-janssen:ocpbugs-86041
Jun 2, 2026
Merged

OCPBUGS-86041: update IsSNO helper function to correctly access the cluster's topology#6110
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
isabella-janssen:ocpbugs-86041

Conversation

@isabella-janssen
Copy link
Copy Markdown
Member

@isabella-janssen isabella-janssen commented Jun 1, 2026

Closes: OCPBUGS-86041

- What I did
This updates the IsSingleNodeTopology helper that is used by SkipOnSingleNodeTopology to correctly select a cluster's topology.

- How to verify it
No tests in the MCO's disruptive suite that should skip on SNO run in the SNO payload rehearsals. The tests should continue passing in the standard jobs.

- Description for the changelog
OCPBUGS-86041: update IsSNO helper function to correctly access the cluster's topology

@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: LGTM mode

@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 1, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 1, 2026

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Jun 1, 2026

Walkthrough

The IsSingleNodeTopology test utility function is updated to query the cluster's controlPlaneTopology field from its new location at .status.controlPlaneTopology instead of the previous path .status.platformStatus.controlPlaneTopology.

Changes

Control Plane Topology Path Update

Layer / File(s) Summary
JSONPath query update for controlPlaneTopology
test/extended-priv/util/clusters.go
IsSingleNodeTopology updates its JSONPath argument from .status.platformStatus.controlPlaneTopology to .status.controlPlaneTopology when checking for SingleReplicaTopologyMode.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 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 PR modifies test utility file containing no Ginkgo test definitions. Modified function only updates a JSONPath query, not test names.
Test Structure And Quality ✅ Passed The modified file is a utility/helper module, not Ginkgo test code. It contains 6 helper functions with no test blocks (It, Describe, etc.), making the custom check inapplicable.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests were added. Only a utility helper function in test/extended-priv/util/clusters.go was modified, so the MicroShift compatibility check does not apply.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR modifies only the helper function IsSingleNodeTopology() in test/extended-priv/util/clusters.go. No new Ginkgo e2e tests are added, so SNO compatibility check does not apply.
Topology-Aware Scheduling Compatibility ✅ Passed PR only fixes a test helper function's JSONPath to correctly query cluster topology; no scheduling constraints added or modified. Change improves SNO cluster detection for test skipping.
Ote Binary Stdout Contract ✅ Passed The change modifies a utility function in a non-OTE-binary file (package util). No stdout writes are introduced; the change is a JSONPath query fix with no process-level stdout violations.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed No new Ginkgo e2e tests added in this PR; only a utility function modification. Check is not applicable.
No-Weak-Crypto ✅ Passed PR modifies test utility to update cluster topology JSONPath query; contains no weak crypto algorithms, no crypto imports, and no non-constant-time secret comparisons.
Container-Privileges ✅ Passed PR only modifies a JSONPath in a test utility function; no container manifests or privileged settings were added or modified.
No-Sensitive-Data-In-Logs ✅ Passed Code only modifies JSONPath for cluster topology metadata. No logging exposes passwords, tokens, API keys, PII, session IDs, hostnames, or customer data.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title directly and specifically describes the main change: updating the IsSNO helper function to correctly access cluster topology, matching the core objective of fixing the topology access path.

✏️ 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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 1, 2026
@isabella-janssen
Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-single-node-disruptive-techpreview periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-3of3 periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-2of3 periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-1of3

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 1, 2026

@isabella-janssen: trigger 4 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-single-node-disruptive-techpreview
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-3of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-2of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-1of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/0aaf9c90-5db9-11f1-8d0e-e8a5f8f4a192-0

@isabella-janssen
Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-single-node-disruptive-techpreview periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-3of3 periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-2of3 periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-1of3

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 2, 2026

@isabella-janssen: trigger 4 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-single-node-disruptive-techpreview
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-3of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-2of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-gcp-mco-disruptive-techpreview-1of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/1ad5f100-5e27-11f1-8125-b806cf7a3df4-0

@isabella-janssen
Copy link
Copy Markdown
Member Author

/verified by payload rehearsals

See in this rehearsal job run that the boot image, CPMS, and custom pool booting tests are skipping on SNO now: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/openshift-machine-config-operator-6110-periodics-e2e-aws-mco-single-node-disruptive-techpreview/2061629493625229312

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

@isabella-janssen: This PR has been marked as verified by payload rehearsals.

Details

In response to this:

/verified by payload rehearsals

See in this rehearsal job run that the boot image, CPMS, and custom pool booting tests are skipping on SNO now: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/openshift-machine-config-operator-6110-periodics-e2e-aws-mco-single-node-disruptive-techpreview/2061629493625229312

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.

@isabella-janssen isabella-janssen changed the title (WIP) OCPBUGS-86041 OCPBUGS-86041: update IsSNO helper function to correctly access the cluster's topology Jun 2, 2026
@isabella-janssen isabella-janssen marked this pull request as ready for review June 2, 2026 13:06
@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 2, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@isabella-janssen: This pull request references Jira Issue OCPBUGS-86041, 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:

Closes: OCPBUGS-86041

- What I did
This updates the IsSingleNodeTopology helper that is used by SkipOnSingleNodeTopology to correctly select a cluster's topology.

- How to verify it
No tests in the MCO's disruptive suite that should skip on SNO run in the SNO payload rehearsals. The tests should continue passing in the standard jobs.

- Description for the changelog
OCPBUGS-86041: update IsSNO helper function to correctly access the cluster's topology

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-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 2, 2026
@isabella-janssen
Copy link
Copy Markdown
Member Author

/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 Jun 2, 2026
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@isabella-janssen: This pull request references Jira Issue OCPBUGS-86041, 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 New, 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-ci openshift-ci Bot requested review from RishabhSaini and djoshy June 2, 2026 13:07
@djoshy
Copy link
Copy Markdown
Contributor

djoshy commented Jun 2, 2026

/lgtm

seems sane to me

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

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aws-ovn
/test e2e-aws-ovn-upgrade
/test e2e-gcp-op-ocl-part1
/test e2e-gcp-op-ocl-part2
/test e2e-gcp-op-part1
/test e2e-gcp-op-part2
/test e2e-gcp-op-single-node
/test e2e-hypershift

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 2, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: djoshy, isabella-janssen

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:
  • OWNERS [djoshy,isabella-janssen]

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

/retest-required

Remaining retests: 0 against base HEAD dd79c64 and 2 for PR HEAD 7f193de in total

@isabella-janssen
Copy link
Copy Markdown
Member Author

/override ci/prow/e2e-gcp-op-ocl-part2
/override ci/prow/e2e-gcp-op-ocl-part1
/override ci/prow/e2e-aws-ovn-upgrade
/override ci/prow/e2e-aws-ovn

This PR is only changing a helper in the extended tests and does not impact any MCO functionality.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 2, 2026

@isabella-janssen: Overrode contexts on behalf of isabella-janssen: ci/prow/e2e-aws-ovn, ci/prow/e2e-aws-ovn-upgrade, ci/prow/e2e-gcp-op-ocl-part1, ci/prow/e2e-gcp-op-ocl-part2

Details

In response to this:

/override ci/prow/e2e-gcp-op-ocl-part2
/override ci/prow/e2e-gcp-op-ocl-part1
/override ci/prow/e2e-aws-ovn-upgrade
/override ci/prow/e2e-aws-ovn

This PR is only changing a helper in the extended tests and does not impact any MCO functionality.

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.

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

/retest-required

Remaining retests: 0 against base HEAD bf66c0b and 1 for PR HEAD 7f193de in total

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 2, 2026

@isabella-janssen: 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.

@openshift-merge-bot openshift-merge-bot Bot merged commit c13cdd8 into openshift:main Jun 2, 2026
17 checks passed
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@isabella-janssen: Jira Issue Verification Checks: Jira Issue OCPBUGS-86041
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-86041 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Closes: OCPBUGS-86041

- What I did
This updates the IsSingleNodeTopology helper that is used by SkipOnSingleNodeTopology to correctly select a cluster's topology.

- How to verify it
No tests in the MCO's disruptive suite that should skip on SNO run in the SNO payload rehearsals. The tests should continue passing in the standard jobs.

- Description for the changelog
OCPBUGS-86041: update IsSNO helper function to correctly access the cluster's topology

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/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. 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. 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