OCPBUGS-86035: Adapt test '54922 - daemon: add check before updating kerne…

[sergiordlr]

…lArgs'. Use --delete-if-present

- What I did

Adapt test case OCP-54922 to use --delete-if-present instead of --delete

The test case needs to be modified since we merged: #5914

- How to verify it

Test OCP-54922 should pass

- Description for the changelog

Summary by CodeRabbit

• Tests
  • Updated test expectations for kernel argument removal behavior to match current implementation.

[openshift-merge-bot]

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

@sergiordlr: This pull request references MCO-2288 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:

…lArgs'. Use --delete-if-present

- What I did

Adapt test case OCP-54922 to use --delete-if-present instead of --delete

The test case needs to be modified since we merged: #5914

- How to verify it

Test OCP-54922 should pass

- Description for the changelog

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]

Walkthrough

The PR updates a test assertion in the kernel argument handling test to reflect the correct log format. The expectedLogArg2Regex regex pattern is changed to expect --delete-if-present instead of --delete when the test verifies that kernel argument removal is logged correctly.

Changes

Kernel Argument Removal Test

Layer / File(s)	Summary
Update log assertion for kernel argument deletion test/extended-priv/mco_kernel.go	The test assertion expectedLogArg2Regex is updated to match the actual MCD log output format --delete-if-present=<kernelArg> instead of --delete=<kernelArg> when removing the first kernel argument in the second scenario.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

🚥 Pre-merge checks | ✅ 12

✅ Passed checks (12 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
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 PR modifies only the test body, not test names. All test names are static and deterministic with no dynamic values like timestamps, UUIDs, or variable references.
Test Structure And Quality	✅ Passed	Test meets quality requirements: single responsibility, proper cleanup with defer statements, appropriate timeouts, meaningful assertion messages, and consistency with codebase patterns.
Microshift Test Compatibility	✅ Passed	The PR only modifies an existing test (no new Ginkgo test declarations). The custom check applies only to NEW tests being added, so it is not applicable to this PR.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	This PR modifies an existing test's regex assertion, not adding new Ginkgo e2e tests. The custom check applies only to newly added tests, so it is not applicable here.
Topology-Aware Scheduling Compatibility	✅ Passed	Test file change only, updating a log assertion regex. No scheduling constraints or topology-affecting changes introduced.
Ote Binary Stdout Contract	✅ Passed	The changed regex pattern is in a test case variable inside an It() block. This is not process-level code and does not produce stdout. The check explicitly excludes code inside It() blocks.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PR modifies an existing test's assertion only. Custom check applies to newly added Ginkgo tests. No new test blocks present.
Title check	✅ Passed	The title clearly summarizes the main change: adapting test 54922 to use the --delete-if-present flag instead of --delete, which aligns with the actual modification in the pull request.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ 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

• X
• Mastodon
• Reddit
• LinkedIn

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

[sergiordlr]

manual execution

https://prow.ci.openshift.org/view/gs/test-platform-results/logs/periodic-ci-openshift-machine-config-operator-release-4.23-periodics-e2e-aws-mco-fips-proxy-longduration/2056400246459600896

The test passed in the manual executions

: [sig-mco][Suite:openshift/machine-config-operator/longduration][Serial][Disruptive] MCO kernel [PolarionID:54922][OTP] daemon: add check before updating kernelArgs [Disruptive] 45m28s

[isabella-janssen]

/lgtm

[openshift-merge-bot]

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]

[APPROVALNOTIFIER] This PR is APPROVED

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

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

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

This is just changing the extended test suite, so these tests are not necessary.

[openshift-ci]

@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, ci/prow/e2e-gcp-op-part1, ci/prow/e2e-gcp-op-part2, ci/prow/e2e-gcp-op-single-node, ci/prow/e2e-hypershift

Details

In response to this:

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

This is just changing the extended test suite, so these tests are not necessary.

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-ci-robot]

@sergiordlr: This pull request references Jira Issue OCPBUGS-86035, 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:

…lArgs'. Use --delete-if-present

- What I did

Adapt test case OCP-54922 to use --delete-if-present instead of --delete

The test case needs to be modified since we merged: #5914

- How to verify it

Test OCP-54922 should pass

- Description for the changelog

Summary by CodeRabbit

• Tests
• Updated test expectations for kernel argument removal behavior to match current implementation.

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]

@sergiordlr: This PR has been marked as verified by @sergiordlr.

Details

In response to this:

Verified using IPI on AWS

The following tests passed:

"[sig-mco] MCO Author:sregidor-Longduration-NonPreRelease-High-51381-[P1][OnCLayer] cordon node before node drain. OCP >= 4.11 [Serial]"
"[sig-mco] MCO Author:sregidor-NonHyperShiftHOST-Longduration-NonPreRelease-Low-85073-[P2] automatically re-cordons manually uncordoned node during update [Disruptive] [Serial][Serial]"
"[sig-mco] MCO Author:sregidor-NonHyperShiftHOST-Longduration-NonPreRelease-Medium-75149-[P1][OnCLayer] Update pool with manually cordoned nodes [Disruptive] [Serial]"

/verified by @sergiordlr

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.

[sergiordlr]

/remove-label verified

[isabella-janssen]

/jira refresh

[openshift-ci-robot]

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

[sergiordlr]

/verified by @sergiordlr

The test passed in the manual execution #6056 (comment)

[openshift-ci-robot]

@sergiordlr: This PR has been marked as verified by @sergiordlr.

Details

In response to this:

/verified by @sergiordlr

The test passed in the manual execution #6056 (comment)

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-merge-bot]

/retest-required

Remaining retests: 0 against base HEAD 18f2450 and 2 for PR HEAD 433e6c8 in total

[openshift-ci]

@sergiordlr: 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]

@sergiordlr: Jira Issue Verification Checks: Jira Issue OCPBUGS-86035
✔️ 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-86035 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:

…lArgs'. Use --delete-if-present

- What I did

Adapt test case OCP-54922 to use --delete-if-present instead of --delete

The test case needs to be modified since we merged: #5914

- How to verify it

Test OCP-54922 should pass

- Description for the changelog

Summary by CodeRabbit

• Tests
• Updated test expectations for kernel argument removal behavior to match current implementation.

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.

[ptalgulk01]

/cherry-pick release-4.22

[openshift-cherrypick-robot]

@ptalgulk01: #6056 failed to apply on top of branch "release-4.22":

Applying: MCO-2288: Adapt test '54922 - daemon: add check before updating kernelArgs'. Use --delete-if-present
Using index info to reconstruct a base tree...
A	test/extended-priv/mco_kernel.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/extended-priv/mco_kernel.go deleted in HEAD and modified in MCO-2288: Adapt test '54922 - daemon: add check before updating kernelArgs'. Use --delete-if-present. Version MCO-2288: Adapt test '54922 - daemon: add check before updating kernelArgs'. Use --delete-if-present of test/extended-priv/mco_kernel.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 MCO-2288: Adapt test '54922 - daemon: add check before updating kernelArgs'. Use --delete-if-present

Details

In response to this:

/cherry-pick release-4.22

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.