[release-4.21] OCPBUGS-99671: Backport node_e2e test migrations by Chandan9112 · Pull Request #31426 · openshift/origin

Chandan9112 · 2026-07-24T10:42:54Z

Summary

Bulk backport of node_e2e test case migrations from main (OCP 5.0) to release-4.21.

These tests were previously backported to release-4.22 via PR #31306 (merged ✅). This PR performs the same backport to release-4.21 with necessary adaptations for the 4.21 codebase.

Jira

OCPBUGS-99671

Related PRs

Release	PR	Status
4.22	#31306	Merged ✅

Changes

New test files (`test/extended/node/node_e2e/`)

File	Test	Feature
`container_runtime_config.go`	ContainerRuntimeConfig pidsLimit/overlaySize	CRC CRD (GA)
`image_mirror_set.go`	ImageDigestMirrorSet / ImageTagMirrorSet	IDMS/ITMS (GA)
`image_registry_config.go`	Image registry allowedRegistries config	image.config (GA)
`initcontainer.go`	Init container restart behavior	Core k8s
`netns_cleanup.go`	Network namespace cleanup	kubelet/CRI-O
`node.go`	Kubelet log level, cgroupv2, devfuse	Core node
`pdb_drain.go`	PDB 100% minAvailable blocks drain	PDB (GA)
`probe_termination.go`	Probe terminationGracePeriodSeconds	Core k8s

Helper files added

node_mcp_helpers.go - Custom MCP creation/cleanup (NodeHasCustomRole)
util/node_helpers.go - GetReadySchedulableWorkerNodes

Modified files

node_utils.go - Updated with main version (exported functions, ctx params)
node_swap_cnv.go - Updated call sites for new function signatures:
- DebugNodeWithChroot → ExecOnNodeWithChroot(ctx,...)
- DebugNodeWithNsenter → ExecOnNodeWithNsenter(ctx,...)
- createDropInFile(oc,...) → createDropInFile(ctx,oc,...)
- removeDropInFile(oc,...) → removeDropInFile(ctx,oc,...)
imagepolicy.go - Exported GetMCPCurrentSpecConfigName and WaitForMCPConfigSpecChangeAndUpdated for cross-package access
README.md - Updated documentation
bindata.go - Regenerated to include new testdata

Testdata

testdata/node/node_e2e/pod-dev-fuse.yaml - Test fixture for devfuse test

Feature Verification

All backported tests target features available in OCP 4.21:

ContainerRuntimeConfig, IDMS/ITMS, image registry config, PDBs, probes are GA
Node cgroupv2, devfuse, kubelet logging are core node features
All tests use [Suite:openshift/disruptive-longrunning] tag

openshift-merge-bot · 2026-07-24T10:42:57Z

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 · 2026-07-24T10:43:02Z

@Chandan9112: This pull request references Jira Issue OCPBUGS-99671, which is invalid:

expected dependent Jira Issue OCPBUGS-81638 to target a version in 4.22.0, but it targets "4.21.z" 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:

Summary

Bulk backport of all node_e2e test case migrations from main (OCP 5.0) to release-4.21.

These tests were previously backported to release-4.22 via PR #31306 (merged ✅). This PR performs the same backport to release-4.21 with necessary adaptations for the 4.21 codebase.

Jira

OCPBUGS-99671

Related PRs

Release PR Status

4.22 #31306 Merged ✅

4.21 (suite definition) #30976 by @BhargaviGudi Merged ✅

4.21 (swap tests) #30973 by @BhargaviGudi Merged ✅

Original PRs on main

OCPNODE-4179: Migrating test case OCP-80983 from openshift-tests-private to origin #30899 - OCPNODE-4179: Migrating test case OCP-80983

OCPNODE-4224: Migrating test case OCP-70987 from OTP to origin #30948 - OCPNODE-4224: Migrating test case OCP-70987

OCPBUGS-83580: Skip dev fuse test on runc runtime #31044 - OCPBUGS-83580: Skip dev fuse test on runc runtime

OCPNODE-4505: Automation creation of OCP-57401 #31142 - OCPNODE-4505: Automation creation of OCP-57401

OCPNODE-4506, OCPNODE-4539: Migrate ContainerRuntimeConfig tests (OCP-45351, OCP-46313) #31153 - OCPNODE-4506, OCPNODE-4539: Migrate ContainerRuntimeConfig tests

OCPNODE-4516: PDB configured with 100% minAvailable - Migrate - 67564 #31161 - OCPNODE-4516: PDB configured with 100% minAvailable

OCPNODE-4535: Automate OCP-44820 change container registry config #31182 - OCPNODE-4535: Automate OCP-44820 change container registry config

Changes

New test files (test/extended/node/node_e2e/)

File Test Feature

container_runtime_config.go ContainerRuntimeConfig pidsLimit/overlaySize CRC CRD (GA)

image_mirror_set.go ImageDigestMirrorSet / ImageTagMirrorSet IDMS/ITMS (GA)

image_registry_config.go Image registry allowedRegistries config image.config (GA)

initcontainer.go Init container restart behavior Core k8s

netns_cleanup.go Network namespace cleanup kubelet/CRI-O

node.go Kubelet log level, cgroupv2, devfuse Core node

pdb_drain.go PDB 100% minAvailable blocks drain PDB (GA)

probe_termination.go Probe terminationGracePeriodSeconds Core k8s

New test files (test/extended/node/)

File Test Feature

kubelet_secret_pulled_images.go KubeletEnsureSecretPulledImages TechPreview (gated)

node_sizing.go NODE_SIZING_ENABLED / autoSizingReserved 4.21+

system_compressible.go System compressible CPU limits 4.21+

Helper files added

node_mcp_helpers.go - Custom MCP creation/cleanup

node_kc_helpers.go - KubeletConfig CRUD + MCP rollout

util/node_helpers.go - GetReadySchedulableWorkerNodes

Modified files

node_utils.go - Updated with main version (exported functions, ctx params)

node_swap_cnv.go - Updated 71 call sites for new function signatures:

DebugNodeWithChroot → ExecOnNodeWithChroot(ctx,...)

DebugNodeWithNsenter → ExecOnNodeWithNsenter(ctx,...)

createDropInFile(oc,...) → createDropInFile(ctx,oc,...)

removeDropInFile(oc,...) → removeDropInFile(ctx,oc,...)

imagepolicy.go - Exported GetMCPCurrentSpecConfigName and WaitForMCPConfigSpecChangeAndUpdated for cross-package access

README.md - Updated documentation

Testdata

testdata/node/node_e2e/pod-dev-fuse.yaml

testdata/node/kubeletconfig/loggingKC.yaml

testdata/node/machineconfigpool/customMCP.yaml

Feature Verification

All backported tests target features that are available in OCP 4.21:

ContainerRuntimeConfig, IDMS/ITMS, image registry config, PDBs, probes are GA

KubeletEnsureSecretPulledImages is gated behind TechPreviewNoUpgrade (test skips if not enabled)

Node sizing / system compressible are 4.21 features (node_sizing.go explicitly states 'This feature is added in OCP 4.21')

Build Verification
go build ./test/extended/... # ✅ PASSES
Made with Cursor

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-07-24T10:43:03Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

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

Review profile: CHILL

Plan: Pro Plus

Run ID: 1a3ecdb1-3b78-4edf-ae58-1bd46a255e67

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

openshift-ci · 2026-07-24T10:43:04Z

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

openshift-ci · 2026-07-24T10:44:07Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: Chandan9112
Once this PR has been reviewed and has the lgtm label, please assign dgoodwin for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Chandan9112 · 2026-07-24T10:52:06Z

/verify-owners

Chandan9112 · 2026-07-24T10:53:48Z

/jira refresh

openshift-ci-robot · 2026-07-24T10:53:55Z

@Chandan9112: This pull request references Jira Issue OCPBUGS-99671, 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.21.z) matches configured target version for branch (4.21.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-88711 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-88711 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
bug has dependents

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.

Chandan9112 · 2026-07-24T10:55:47Z

/payload-job periodic-ci-openshift-release-main-nightly-4.21-e2e-aws-disruptive-longrunning

openshift-ci · 2026-07-24T10:55:58Z

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

periodic-ci-openshift-release-main-nightly-4.21-e2e-aws-disruptive-longrunning

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/3a60fe70-874e-11f1-86c3-6238f26c83bb-0

Chandan9112 · 2026-07-24T10:56:45Z

/payload-job periodic-ci-openshift-release-main-nightly-4.21-e2e-aws-disruptive-longrunning-techpreview

openshift-ci · 2026-07-24T10:56:52Z

@Chandan9112: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-nightly-4.21-e2e-aws-disruptive-longrunning-techpreview-1of2
periodic-ci-openshift-release-main-nightly-4.21-e2e-aws-disruptive-longrunning-techpreview-2of2

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5d600a10-874e-11f1-8340-bb0595ac833c-0

Chandan9112 · 2026-07-24T10:57:13Z

/payload-job periodic-ci-openshift-release-main-ci-4.21-e2e-gcp-ovn-techpreview

openshift-ci · 2026-07-24T10:57:23Z

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

periodic-ci-openshift-release-main-ci-4.21-e2e-gcp-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/6dc98c00-874e-11f1-9b1b-be2a3e0accbc-0

Chandan9112 · 2026-07-24T12:47:35Z

/retest

Chandan9112 · 2026-07-25T02:38:34Z

/retest

…-4.21 Bulk backport of node_e2e test case migrations from main (OCP 5.0) to release-4.21. These tests were previously backported to release-4.22 via PR openshift#31306. New test files added (test/extended/node/node_e2e/): - container_runtime_config.go: ContainerRuntimeConfig pidsLimit/overlaySize - image_mirror_set.go: ImageDigestMirrorSet/ImageTagMirrorSet verification - image_registry_config.go: Image registry allowedRegistries configuration - initcontainer.go: Init container restart behavior - netns_cleanup.go: Network namespace cleanup after pod deletion - node.go: Kubelet log level, cgroupv2 default, devfuse in CRI-O - pdb_drain.go: PDB 100% minAvailable blocks drain - probe_termination.go: Probe terminationGracePeriodSeconds Helper files added/modified: - node_mcp_helpers.go: Custom MCP creation/cleanup helpers (NodeHasCustomRole) - node_utils.go: Updated helper functions (ExecOnNodeWithChroot, WaitForMCP, etc.) - util/node_helpers.go: GetReadySchedulableWorkerNodes - testdata/node/node_e2e/pod-dev-fuse.yaml: Test fixture for devfuse test Existing files modified: - node_swap_cnv.go: Updated to use new function signatures from node_utils.go - imagepolicy/imagepolicy.go: Exported GetMCPCurrentSpecConfigName and WaitForMCPConfigSpecChangeAndUpdated for use by node_e2e tests - README.md: Updated with latest test documentation Reference: openshift#31306 (release-4.22 backport) Co-authored-by: Cursor <cursoragent@cursor.com>

openshift-ci-robot · 2026-07-26T06:43:52Z

@Chandan9112: This pull request references Jira Issue OCPBUGS-99671, 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.21.z) matches configured target version for branch (4.21.z)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
release note type set to "Release Note Not Required"
dependent bug Jira Issue OCPBUGS-88711 is in the state Closed (Done), which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-88711 targets the "4.22.0" version, which is one of the valid target versions: 4.22.0
bug has dependents

Details

In response to this:

Summary

Bulk backport of node_e2e test case migrations from main (OCP 5.0) to release-4.21.

These tests were previously backported to release-4.22 via PR #31306 (merged ✅). This PR performs the same backport to release-4.21 with necessary adaptations for the 4.21 codebase.

Jira

OCPBUGS-99671

Related PRs

Release PR Status

4.22 #31306 Merged ✅

Changes

New test files (test/extended/node/node_e2e/)

File Test Feature

container_runtime_config.go ContainerRuntimeConfig pidsLimit/overlaySize CRC CRD (GA)

image_mirror_set.go ImageDigestMirrorSet / ImageTagMirrorSet IDMS/ITMS (GA)

image_registry_config.go Image registry allowedRegistries config image.config (GA)

initcontainer.go Init container restart behavior Core k8s

netns_cleanup.go Network namespace cleanup kubelet/CRI-O

node.go Kubelet log level, cgroupv2, devfuse Core node

pdb_drain.go PDB 100% minAvailable blocks drain PDB (GA)

probe_termination.go Probe terminationGracePeriodSeconds Core k8s

Helper files added

node_mcp_helpers.go - Custom MCP creation/cleanup (NodeHasCustomRole)

util/node_helpers.go - GetReadySchedulableWorkerNodes

Modified files

node_utils.go - Updated with main version (exported functions, ctx params)

node_swap_cnv.go - Updated call sites for new function signatures:

DebugNodeWithChroot → ExecOnNodeWithChroot(ctx,...)

DebugNodeWithNsenter → ExecOnNodeWithNsenter(ctx,...)

createDropInFile(oc,...) → createDropInFile(ctx,oc,...)

removeDropInFile(oc,...) → removeDropInFile(ctx,oc,...)

imagepolicy.go - Exported GetMCPCurrentSpecConfigName and WaitForMCPConfigSpecChangeAndUpdated for cross-package access

README.md - Updated documentation

bindata.go - Regenerated to include new testdata

Testdata

testdata/node/node_e2e/pod-dev-fuse.yaml - Test fixture for devfuse test

Feature Verification

All backported tests target features available in OCP 4.21:

ContainerRuntimeConfig, IDMS/ITMS, image registry config, PDBs, probes are GA

Node cgroupv2, devfuse, kubelet logging are core node features

All tests use [Suite:openshift/disruptive-longrunning] tag

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.

Chandan9112 · 2026-07-26T06:54:57Z

/payload-job periodic-ci-openshift-release-main-nightly-4.21-e2e-aws-disruptive-longrunning
/payload-job periodic-ci-openshift-release-main-ci-4.21-e2e-gcp-ovn-techpreview

openshift-ci · 2026-07-26T06:55:01Z

@Chandan9112: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-nightly-4.21-e2e-aws-disruptive-longrunning
periodic-ci-openshift-release-main-ci-4.21-e2e-gcp-ovn-techpreview

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/eab4b070-88be-11f1-8a85-107d8ec34452-0

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 Jul 24, 2026

openshift-ci-robot added 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 Jul 24, 2026

openshift-ci Bot added the do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Jul 24, 2026

Chandan9112 force-pushed the backport-node-e2e-4.21 branch from 24826ad to 33da5b3 Compare July 24, 2026 10:51

openshift-ci Bot removed the do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. label Jul 24, 2026

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 Jul 24, 2026

Chandan9112 marked this pull request as ready for review July 24, 2026 10:55

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 Jul 24, 2026

openshift-ci Bot requested review from deads2k and sjenning July 24, 2026 10:56

Chandan9112 force-pushed the backport-node-e2e-4.21 branch from 33da5b3 to a99e470 Compare July 26, 2026 06:38

Chandan9112 force-pushed the backport-node-e2e-4.21 branch from a99e470 to 33f7518 Compare July 26, 2026 06:42

Uh oh!

Conversation

Chandan9112 commented Jul 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Jira

Related PRs

Changes

New test files (test/extended/node/node_e2e/)

Helper files added

Modified files

Testdata

Feature Verification

Uh oh!

openshift-merge-bot Bot commented Jul 24, 2026

Uh oh!

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

Uh oh!

Summary

Jira

Related PRs

Original PRs on main

Changes

New test files (test/extended/node/node_e2e/)

New test files (test/extended/node/)

Helper files added

Modified files

Testdata

Feature Verification

Build Verification

Uh oh!

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

Uh oh!

Review skipped

Uh oh!

openshift-ci Bot commented Jul 24, 2026

Uh oh!

openshift-ci Bot commented Jul 24, 2026

Uh oh!

Chandan9112 commented Jul 24, 2026

Uh oh!

Chandan9112 commented Jul 24, 2026

Uh oh!

openshift-ci-robot commented Jul 24, 2026

Uh oh!

Chandan9112 commented Jul 24, 2026

Uh oh!

openshift-ci Bot commented Jul 24, 2026

Uh oh!

Chandan9112 commented Jul 24, 2026

Uh oh!

openshift-ci Bot commented Jul 24, 2026

Uh oh!

Chandan9112 commented Jul 24, 2026

Uh oh!

openshift-ci Bot commented Jul 24, 2026

Uh oh!

Chandan9112 commented Jul 24, 2026

Uh oh!

Chandan9112 commented Jul 25, 2026

Uh oh!

openshift-ci-robot commented Jul 26, 2026

Summary

Jira

Related PRs

Changes

New test files (test/extended/node/node_e2e/)

Helper files added

Modified files

Testdata

Feature Verification

Uh oh!

Chandan9112 commented Jul 26, 2026

Uh oh!

openshift-ci Bot commented Jul 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Chandan9112 commented Jul 24, 2026 •

edited

Loading

New test files (`test/extended/node/node_e2e/`)

openshift-ci-robot commented Jul 24, 2026 •

edited by openshift-ci Bot

Loading

New test files (`test/extended/node/node_e2e/`)

New test files (`test/extended/node/`)

coderabbitai Bot commented Jul 24, 2026 •

edited

Loading

New test files (`test/extended/node/node_e2e/`)