[release-4.20] OCPBUGS-66963: Fix MachineConfigNode test in two-node fencing clusters #30540

isabella-janssen · 2025-11-26T15:02:10Z

What I did:
This updates the Should properly transition through MCN conditions on rebootless node update test to apply a MC against the master MCP for any cluster where no worker MCP machines exist. Previously, only SNO clusters were treated differently, leading to issues with the test when the two-node fencing tests were turned on.

How to verify:
Make sure the two-node case (periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial) is passing with this change.

openshift-ci-robot · 2025-11-26T15:02:13Z

Pipeline controller notification
This repository 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 · 2025-11-26T15:02:15Z

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

isabella-janssen · 2025-11-26T15:02:23Z

/payload-job periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial

openshift-ci · 2025-11-26T15:02:28Z

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

periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ea64d9f0-cad8-11f0-82d9-b032e5074172-0

isabella-janssen · 2025-12-04T03:53:19Z

/payload-job periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial

openshift-ci · 2025-12-04T03:53:23Z

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

periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c65c98d0-d0c4-11f0-9444-fc6aaf0198b4-0

isabella-janssen · 2025-12-04T13:56:50Z

/payload-job periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial

openshift-ci · 2025-12-04T13:57:01Z

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

periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/15acd040-d119-11f0-8c35-805df7d32cb7-0

… MCP nodes

isabella-janssen · 2025-12-05T13:17:49Z

/payload-job periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial

openshift-ci · 2025-12-05T13:17:56Z

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

periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/cca79370-d1dc-11f0-9c86-b5ab24873007-0

isabella-janssen · 2025-12-08T14:56:47Z

/jira cherry-pick OCPBUGS-65970

openshift-ci-robot · 2025-12-08T14:56:58Z

@isabella-janssen: Jira Issue OCPBUGS-65970 has been cloned as Jira Issue OCPBUGS-66963. Will retitle bug to link to clone.
/retitle OCPBUGS-66963: Fix MachineConfigNode test in two-node fencing clusters

Details

In response to this:

/jira cherry-pick OCPBUGS-65970

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-robot · 2025-12-08T14:57:08Z

@isabella-janssen: This pull request references Jira Issue OCPBUGS-66963, which is invalid:

expected dependent Jira Issue OCPBUGS-65970 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

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:

What I did:
This updates the Should properly transition through MCN conditions on rebootless node update test to apply a MC against the master MCP for any cluster where no worker MCP machines exist. Previously, only SNO clusters were treated differently, leading to issues with the test when the two-node fencing tests were turned on.

How to verify:
Make sure the two-node case is passing with this change.

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 · 2025-12-09T13:51:45Z

/jira refresh

openshift-ci-robot · 2025-12-09T13:51:56Z

@isabella-janssen: This pull request references Jira Issue OCPBUGS-66963, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.20.z) matches configured target version for branch (4.20.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-65970 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-65970 targets the "4.21.0" version, which is one of the valid target versions: 4.21.0
bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

The bug has been updated to refer to the pull request using the external bug tracker.

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-robot · 2025-12-09T13:56:03Z

@isabella-janssen: This pull request references Jira Issue OCPBUGS-66963, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.20.z) matches configured target version for branch (4.20.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-65970 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-65970 targets the "4.21.0" version, which is one of the valid target versions: 4.21.0
bug has dependents

Requesting review from QA contact:
/cc @sergiordlr

Details

In response to this:

What I did:
This updates the Should properly transition through MCN conditions on rebootless node update test to apply a MC against the master MCP for any cluster where no worker MCP machines exist. Previously, only SNO clusters were treated differently, leading to issues with the test when the two-node fencing tests were turned on.

How to verify:
Make sure the two-node case (periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial ) is passing with this change.

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 · 2025-12-09T14:04:57Z

/verified by periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial

This change was verified by checking whether the periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial test is now consistently passing for the Should properly transition through MCN conditions on rebootless node update MCN test. One passing test can be seen here.

openshift-ci-robot · 2025-12-09T14:05:11Z

@isabella-janssen: This PR has been marked as verified by periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial.

Details

In response to this:

/verified by periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial

This change was verified by checking whether the periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial test is now consistently passing for the Should properly transition through MCN conditions on rebootless node update MCN test. One passing test can be seen here.

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.

djoshy · 2025-12-09T15:01:58Z

test/extended/machine_config/helpers.go

-func GetUpdatingNodeSNO(oc *exutil.CLI, mcpName string) corev1.Node {
+// `GetUpdatingNode` returns the updating node, determined by the node targetting a new desired
+// config, when the corresponding MCP starts updating
+func GetUpdatingNode(oc *exutil.CLI, mcpName, originalConfigVersion string) corev1.Node {


Bit of a nit, and not really relevant to our tests, but there could potentially be more than one node updating in a pool based on maxUnavailable value.

Yeah, that's true and I generally agree, but for the test I really only care to track 1 (even if 2 are updating). I could generalize the func so it is GetUpdatingNodes and returns all updating nodes then in my func just use the first from the list. If we need it more general I think it's fair to have whoever needs that change to make it.

ack, sounds good to me

djoshy · 2025-12-09T15:06:04Z

/lgtm

Changes make sense to me, there might be a bit of room to refactor ValidateMCNConditionTransitionsOnRebootlessUpdate and ValidateMCNConditionTransitionsOnRebootlessUpdateMaster, but I don't think its a blocking issue by any means.

openshift-ci · 2025-12-09T15:07:44Z

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

~~test/extended/machine_config/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

isabella-janssen · 2025-12-09T15:20:17Z

Changes make sense to me, there might be a bit of room to refactor ValidateMCNConditionTransitionsOnRebootlessUpdate and ValidateMCNConditionTransitionsOnRebootlessUpdateMaster, but I don't think its a blocking issue by any means.

Agree, but for the sake of keeping the scope of the backport as small as possible I decided to keep them separate (I probably should've consolidated them when I first implemented them). Hopefully in the QE migration work I can help clean stuff like this up.

openshift-ci-robot · 2025-12-09T16:05:52Z

/retest-required

Remaining retests: 0 against base HEAD 75ff26f and 2 for PR HEAD 61c4f08 in total

isabella-janssen · 2025-12-09T18:16:16Z

/retest-required

openshift-ci-robot · 2025-12-09T23:05:34Z

/retest-required

Remaining retests: 0 against base HEAD 70c1be8 and 1 for PR HEAD 61c4f08 in total

openshift-ci · 2025-12-10T02:07:00Z

@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-ci-robot · 2025-12-10T02:10:21Z

@isabella-janssen: Jira Issue Verification Checks: Jira Issue OCPBUGS-66963
✔️ 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-66963 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:

What I did:
This updates the Should properly transition through MCN conditions on rebootless node update test to apply a MC against the master MCP for any cluster where no worker MCP machines exist. Previously, only SNO clusters were treated differently, leading to issues with the test when the two-node fencing tests were turned on.

How to verify:
Make sure the two-node case (periodic-ci-openshift-release-master-nightly-4.20-e2e-metal-ovn-two-node-fencing-serial) is passing with this change.

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 · 2025-12-10T03:40:32Z

/cherrypick release-4.19

openshift-cherrypick-robot · 2025-12-10T03:43:42Z

@isabella-janssen: new pull request created: #30590

Details

In response to this:

/cherrypick release-4.19

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-robot · 2025-12-11T01:45:25Z

Fix included in accepted release 4.20.0-0.nightly-2025-12-10-143047

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 Nov 26, 2025

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 26, 2025

isabella-janssen mentioned this pull request Nov 26, 2025

OCPBUGS-65970: Fix MachineConfigNode test in two-node fencing clusters #30532

Merged

2 tasks

isabella-janssen force-pushed the ocpbugs-65970-4.20 branch from aa22c86 to 63790e1 Compare December 4, 2025 03:52

isabella-janssen force-pushed the ocpbugs-65970-4.20 branch from 145cb70 to c2e3fd9 Compare December 4, 2025 13:56

MCO: update MCN condition transition test for clusters with no worker…

61c4f08

… MCP nodes

isabella-janssen force-pushed the ocpbugs-65970-4.20 branch from 6053124 to 61c4f08 Compare December 5, 2025 13:17

isabella-janssen changed the title ~~(WIP)~~ Fix MachineConfigNode test in two-node fencing clusters Dec 8, 2025

openshift-ci bot changed the title ~~Fix MachineConfigNode test in two-node fencing clusters~~ OCPBUGS-66963: Fix MachineConfigNode test in two-node fencing clusters Dec 8, 2025

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

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Dec 8, 2025

isabella-janssen changed the title ~~OCPBUGS-66963: Fix MachineConfigNode test in two-node fencing clusters~~ [release-4.20] OCPBUGS-66963: Fix MachineConfigNode test in two-node fencing clusters Dec 8, 2025

isabella-janssen marked this pull request as ready for review December 9, 2025 13:51

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 Dec 9, 2025

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 Dec 9, 2025

openshift-ci bot requested review from dkhater-redhat, sergiordlr and yuqi-zhang December 9, 2025 13:51

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Dec 9, 2025

djoshy reviewed Dec 9, 2025

View reviewed changes

openshift-ci bot assigned djoshy Dec 9, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 9, 2025

openshift-merge-bot bot merged commit 2854817 into openshift:release-4.20 Dec 10, 2025
17 checks passed

isabella-janssen deleted the ocpbugs-65970-4.20 branch December 10, 2025 03:40

openshift-cherrypick-robot mentioned this pull request Dec 10, 2025

[release-4.19] OCPBUGS-67146: Fix MachineConfigNode test in two-node fencing clusters #30590

Merged

[release-4.20] OCPBUGS-66963: Fix MachineConfigNode test in two-node fencing clusters #30540

[release-4.20] OCPBUGS-66963: Fix MachineConfigNode test in two-node fencing clusters #30540

Uh oh!

Conversation

isabella-janssen commented Nov 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Nov 26, 2025

Uh oh!

openshift-ci bot commented Nov 26, 2025

Uh oh!

isabella-janssen commented Nov 26, 2025

Uh oh!

openshift-ci bot commented Nov 26, 2025

Uh oh!

isabella-janssen commented Dec 4, 2025

Uh oh!

openshift-ci bot commented Dec 4, 2025

Uh oh!

isabella-janssen commented Dec 4, 2025

Uh oh!

openshift-ci bot commented Dec 4, 2025

Uh oh!

isabella-janssen commented Dec 5, 2025

Uh oh!

openshift-ci bot commented Dec 5, 2025

Uh oh!

isabella-janssen commented Dec 8, 2025

Uh oh!

openshift-ci-robot commented Dec 8, 2025

Uh oh!

openshift-ci-robot commented Dec 8, 2025

Uh oh!

isabella-janssen commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

isabella-janssen commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

djoshy Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

isabella-janssen Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

djoshy Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

djoshy commented Dec 9, 2025

Uh oh!

openshift-ci bot commented Dec 9, 2025

Uh oh!

isabella-janssen commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

isabella-janssen commented Dec 9, 2025

Uh oh!

openshift-ci-robot commented Dec 9, 2025

Uh oh!

openshift-ci bot commented Dec 10, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 10, 2025

Uh oh!

isabella-janssen commented Dec 10, 2025

Uh oh!

openshift-cherrypick-robot commented Dec 10, 2025

Uh oh!

openshift-merge-robot commented Dec 11, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

isabella-janssen commented Nov 26, 2025 •

edited

Loading