Skip to content

WIP - SNO Stabilization - #6362

Draft
isabella-janssen wants to merge 2 commits into
openshift:mainfrom
isabella-janssen:disruptive-suite-stabilization-v2
Draft

WIP - SNO Stabilization#6362
isabella-janssen wants to merge 2 commits into
openshift:mainfrom
isabella-janssen:disruptive-suite-stabilization-v2

Conversation

@isabella-janssen

@isabella-janssen isabella-janssen commented Aug 3, 2026

Copy link
Copy Markdown
Member

- What I did

- How to verify it

- Description for the changelog

Summary by CodeRabbit

  • Bug Fixes
    • Improved image-mode status reporting for desired image updates.
    • Prevented readiness reporting until the expected configuration is applied.
    • Enhanced upgrade monitoring across transient connection issues and completed transitions.
    • Improved detection of reboot and post-action conditions during machine configuration updates.
    • Increased reliability of image-mode and single-node deployment transitions.
    • Added more resilient waiting and recovery during configuration updates, including transient connection interruptions.

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

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

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

coderabbitai Bot commented Aug 3, 2026

Copy link
Copy Markdown

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

Walkthrough

Changes

Image-mode upgrade flow

Layer / File(s) Summary
Desired image reconciliation
pkg/upgrademonitor/upgrade_monitor.go
MachineConfigNode no-diff checks and SSA payloads now include ConfigImage.DesiredImage when image-mode status reporting is enabled.
Transition condition validation
test/extended/machineconfignode.go
Transition checks accept reset intermediate conditions, tolerate transient SNO connection errors, skip completed-update waits, and use updated timing limits.
Pool and image-mode convergence
test/extended/machineconfigpool.go, test/extended/image_mode_status_reporting.go
MCP readiness verifies matching spec and status configurations. Image-mode tests wait for MCP recovery, track count mismatches by elapsed time, and classify transient retrieval errors.

Estimated code review effort: 4 (Complex) | ~45 minutes

Sequence Diagram(s)

sequenceDiagram
  participant ImageModeTest
  participant MachineConfigNode
  participant MachineConfigPool
  participant UpgradeMonitor

  UpgradeMonitor->>MachineConfigNode: Compare desired image and build SSA payload
  ImageModeTest->>MachineConfigNode: Validate transition conditions
  MachineConfigNode-->>ImageModeTest: Return condition state
  ImageModeTest->>MachineConfigPool: Poll configuration and node counts
  MachineConfigPool-->>ImageModeTest: Return convergence status
  ImageModeTest->>MachineConfigPool: Wait for Updated after MOSC removal
  MachineConfigPool-->>ImageModeTest: Return updated pool state
Loading

Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 error, 1 warning)

Check name Status Explanation Resolution
No-Sensitive-Data-In-Logs ❌ Error The PR adds Infof calls that format raw Kubernetes Get/List errors; Go url.Error includes the request URL, which can expose an internal API hostname. Do not log raw client errors. Log a sanitized error category or type, and omit request URLs and other connection details.
Test Structure And Quality ⚠️ Warning Changed Ginkgo tests have no AfterEach/DeferCleanup hook, and ConfirmUpdatedMCNStatus uses bare Expect(workerErr).NotTo(HaveOccurred()) at machineconfignode.go:466. Move resource cleanup into AfterEach or DeferCleanup, and add a diagnostic message identifying the MCN retrieval failure.
✅ Passed checks (13 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the main purpose of the changes: stabilizing single-node OpenShift test behavior.
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 The cumulative PR diff changes no Ginkgo title declarations. The five titles in image_mode_status_reporting.go are static and contain no pod, node, namespace, timestamp, IP, or generated identifier.
Microshift Test Compatibility ✅ Passed The PR adds no new Ginkgo declarations. All affected existing It tests retain [apigroup:machineconfiguration.openshift.io], which MicroShift CI skips.
Single Node Openshift (Sno) Test Compatibility ✅ Passed The PR adds no new Ginkgo It, Describe, Context, or When declarations; it only modifies existing test helpers and synchronization logic, so the SNO new-test check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed The aggregate patch changes four MCN status/test files and adds no affinity, topology spread, node selector, toleration, replica, PDB, or other scheduling constraints.
Ote Binary Stdout Contract ✅ Passed No direct stdout writes were added; OTE main uses fmt.Sprintf only, changed test logs target GinkgoWriter, and klog calls remain outside process-level setup code.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR adds no Ginkgo test declarations. Added test logic uses Kubernetes APIs and cluster CLI only; scans found no IPv4 literals, IPv4-only parsing, or public-network access.
No-Weak-Crypto ✅ Passed The PR changes four files; added-line and changed-file scans found no MD5, SHA1, DES, RC4, Blowfish, ECB, custom crypto, or secret/token comparisons. Existing MD5 matches are unchanged.
Container-Privileges ✅ Passed The full branch diff changes only four Go files, adds no manifests, and adds no privileged, host namespace, SYS_ADMIN, or privilege-escalation settings.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@isabella-janssen

Copy link
Copy Markdown
Member Author

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

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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:

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 commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

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

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

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/52cacfc0-8f43-11f1-8f85-ba7639252e8b-0

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

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

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

Inline comments:
In `@pkg/upgrademonitor/upgrade_monitor.go`:
- Around line 535-552: Update the no-diff guard in the MCN reconciliation flow
to compare mcNode.Spec.ConfigImage.DesiredImage directly with
newMCNode.Spec.ConfigImage.DesiredImage, without gating that comparison on
FeatureGateImageModeStatusReporting. Preserve the existing SSA payload behavior
in specApplyConfig so the empty desired image transition proceeds and clears the
field.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 14f15b7d-2eb7-470e-9340-4cd22e57aea8

📥 Commits

Reviewing files that changed from the base of the PR and between 215097b and 5581a89.

📒 Files selected for processing (4)
  • pkg/upgrademonitor/upgrade_monitor.go
  • test/extended/image_mode_status_reporting.go
  • test/extended/machineconfignode.go
  • test/extended/machineconfigpool.go

Comment thread pkg/upgrademonitor/upgrade_monitor.go
@isabella-janssen

Copy link
Copy Markdown
Member Author

/test tls-pqc-readiness

@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload abort

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

@isabella-janssen: it appears that you have attempted to use some version of the payload command, but your comment was incorrectly formatted and cannot be acted upon. See the docs for usage info.

@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-single-node-disruptive-techpreview

@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

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

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

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/efaf7890-8f61-11f1-92ec-e6c7fe0a00e3-0

@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

@isabella-janssen: trigger 3 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-disruptive-techpreview-1of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview-2of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview-3of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/fed3d050-8f61-11f1-9417-2878328269f2-0

@openshift-ci

openshift-ci Bot commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/0363dfc0-8f62-11f1-8d53-5a432a6811e0-0

@isabella-janssen
isabella-janssen force-pushed the disruptive-suite-stabilization-v2 branch 2 times, most recently from 7dc2156 to 1e3957e Compare August 4, 2026 15:32
@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-single-node-disruptive-techpreview

@openshift-ci

openshift-ci Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

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

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

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ea062750-9019-11f1-9868-58c818aa0ee9-0

@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview

@openshift-ci

openshift-ci Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

@isabella-janssen: trigger 3 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-disruptive-techpreview-1of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview-2of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview-3of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ef5fa140-9019-11f1-9446-fc8702133699-0

@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

@openshift-ci

openshift-ci Bot commented Aug 4, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/f367bc00-9019-11f1-848b-36ee69c9d173-0

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

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

Inline comments:
In `@test/extended/image_mode_status_reporting.go`:
- Around line 423-449: The polling callback around
mcnAndNodeAnnotationMachineCountsMatch must distinguish non-transient mcpErr or
nodesErr failures from count mismatches. Propagate the helper’s non-retryable
error state and call o.StopTrying before entering the mismatch-deadline logic,
while retaining retries only for connection errors and genuine count mismatches.
Ensure all returned errors are explicitly handled rather than ignored across the
additionally affected polling paths.
- Around line 465-469: Update the MCP error logging in the transient and
non-transient branches around isTransientConnectionError, including the
corresponding GetNodesByRole path, to avoid logging raw mcpErr values. Log only
stable error categories or use a redacted error representation that excludes
request URLs and transport details, while preserving the existing retry
classification and return behavior.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 2b99dd5b-c9c0-4bd9-a6c0-3f906a841502

📥 Commits

Reviewing files that changed from the base of the PR and between 7dc2156 and 1e3957e.

📒 Files selected for processing (4)
  • pkg/upgrademonitor/upgrade_monitor.go
  • test/extended/image_mode_status_reporting.go
  • test/extended/machineconfignode.go
  • test/extended/machineconfigpool.go
🚧 Files skipped from review as they are similar to previous changes (3)
  • test/extended/machineconfignode.go
  • test/extended/machineconfigpool.go
  • pkg/upgrademonitor/upgrade_monitor.go

Comment thread test/extended/image_mode_status_reporting.go
Comment thread test/extended/image_mode_status_reporting.go
@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload-aggregate periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview 5

@openshift-ci

openshift-ci Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/2c32cc80-90d0-11f1-91c8-d3817e296d5e-0

@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

@openshift-ci

openshift-ci Bot commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/b68f04d0-910b-11f1-8c6d-361e78c7ce23-0

@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

@openshift-ci

openshift-ci Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/8eec6c80-9131-11f1-93ca-c14894c258fd-0

@isabella-janssen
isabella-janssen force-pushed the disruptive-suite-stabilization-v2 branch from 1e3957e to 02857f7 Compare August 6, 2026 16:20
@coderabbitai

coderabbitai Bot commented Aug 6, 2026

Copy link
Copy Markdown

Note

GitHub couldn't provide a complete incremental comparison for this pull request, so CodeRabbit is performing a full review instead. This review may take a little longer.

@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview

@openshift-ci

openshift-ci Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

@isabella-janssen: trigger 3 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-disruptive-techpreview-1of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview-2of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview-3of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/ca320d00-91b2-11f1-8e66-7fde7a253def-0

@isabella-janssen

Copy link
Copy Markdown
Member Author

/payload-job periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

@openshift-ci

openshift-ci Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

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

  • periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/dcb60a80-91b2-11f1-86c4-39d6063a608f-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

@openshift-ci

openshift-ci Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

@isabella-janssen: trigger 3 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-1of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-single-node-disruptive-techpreview-2of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-single-node-disruptive-techpreview-3of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/e1335540-91b2-11f1-8159-b01181677f35-0

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

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

Inline comments:
In `@test/extended/image_mode_status_reporting.go`:
- Around line 423-430: In the mismatch-tracking callback around
mcnAndNodeAnnotationMachineCountsMatch, reset firstMismatchTime to its zero
value whenever isConnErr is true before returning false. Preserve the existing
retry behavior so mismatchDeadline applies only to uninterrupted count
mismatches while the outer Eventually timeout continues bounding
connection-error retries.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: b9a88149-03fa-4678-aabc-a531fa8045b8

📥 Commits

Reviewing files that changed from the base of the PR and between d690173 and 02857f7.

📒 Files selected for processing (4)
  • pkg/upgrademonitor/upgrade_monitor.go
  • test/extended/image_mode_status_reporting.go
  • test/extended/machineconfignode.go
  • test/extended/machineconfigpool.go
🚧 Files skipped from review as they are similar to previous changes (3)
  • test/extended/machineconfigpool.go
  • pkg/upgrademonitor/upgrade_monitor.go
  • test/extended/machineconfignode.go

Comment thread test/extended/image_mode_status_reporting.go
@isabella-janssen
isabella-janssen force-pushed the disruptive-suite-stabilization-v2 branch from 02857f7 to 4658a49 Compare August 6, 2026 16:52
@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-release-main-ci-5.0-e2e-aws-ovn-techpreview periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview

@openshift-ci

openshift-ci Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

@isabella-janssen: trigger 7 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-1of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-single-node-disruptive-techpreview-2of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-single-node-disruptive-techpreview-3of3
  • periodic-ci-openshift-release-main-ci-5.0-e2e-aws-ovn-techpreview
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview-1of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview-2of3
  • periodic-ci-openshift-machine-config-operator-release-5.0-periodics-e2e-aws-mco-disruptive-techpreview-3of3

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5f0d35e0-91b7-11f1-93cb-d446440f7f9a-0

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. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant