OCPBUGS-77839: Remove 'AppliedFilesAndOS' reference in MachineConfigNode's node degrade test#30841
Conversation
|
Pipeline controller notification For optional jobs, comment This repository is configured in: automatic mode |
openshift-ci-robot
added
jira/valid-reference
|
@isabella-janssen: This pull request references Jira Issue OCPBUGS-77839, which is valid. 3 validation(s) were run on this bug
The bug has been updated to refer to the pull request using the external bug tracker. DetailsIn response to this: 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. |
WalkthroughUpdates MCN condition references in test code from "FilesAndOS" variants to "Files" variants, including corresponding log messages and status assertions. This changes which condition names are verified during node degrade validation testing. Changes
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 inconclusive)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Warning There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure. 🔧 golangci-lint (2.5.0)Error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions Tip Try Coding Plans. Let us write the prompt for your AI agent so you can ship faster (with fewer bugs). Comment |
openshift-ci
bot
added
the
approved
|
@isabella-janssen: This PR was included in a payload test run from openshift/machine-config-operator#5744
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/f4504140-18ba-11f1-8b71-b09bebb82348-0 |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Caution
Some comments are outside the diff and can’t be posted inline due to platform limitations.
⚠️ Outside diff range comments (1)
test/extended/machine_config/machine_config_node.go (1)
462-476:⚠️ Potential issue | 🟡 MinorInconsistent condition name in log and error messages.
The condition type was updated to
MachineConfigNodeUpdateFiles(AppliedFiles), but line 475 and the error message on line 476 still reference "AppliedFilesAndOS". This will produce confusing test output during failures.Proposed fix to align the message strings
framework.Logf("Validating that `UpdateExecuted` condition in '%v' MCN has a status of 'Unknown'.", degradedNodeMCN.Name) o.Expect(executedCondition.Status).Should(o.Equal(metav1.ConditionUnknown), "Condition 'UpdateExecuted' does not have the expected status of 'Unknown'.") - framework.Logf("Validating that `AppliedFilesAndOS` condition in '%v' MCN has a status of 'Unknown'.", degradedNodeMCN.Name) - o.Expect(fileCondition.Status).Should(o.Equal(metav1.ConditionUnknown), "Condition 'AppliedFilesAndOS' does not have the expected status of 'Unknown'.") + framework.Logf("Validating that `AppliedFiles` condition in '%v' MCN has a status of 'Unknown'.", degradedNodeMCN.Name) + o.Expect(fileCondition.Status).Should(o.Equal(metav1.ConditionUnknown), "Condition 'AppliedFiles' does not have the expected status of 'Unknown'.")🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@test/extended/machine_config/machine_config_node.go` around lines 462 - 476, The test prints and asserts messages that still reference "AppliedFilesAndOS" even though the condition type was changed to MachineConfigNodeUpdateFiles; update the log/expect strings that mention AppliedFilesAndOS (near the use of fileCondition and the o.Expect that checks its status) to reference the new name "AppliedFiles" or use the constant mcfgv1.MachineConfigNodeUpdateFiles for clarity so the framework.Logf and o.Expect error message match the actual condition type obtained by GetMCNCondition(degradedNodeMCN, mcfgv1.MachineConfigNodeUpdateFiles).
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Outside diff comments:
In `@test/extended/machine_config/machine_config_node.go`:
- Around line 462-476: The test prints and asserts messages that still reference
"AppliedFilesAndOS" even though the condition type was changed to
MachineConfigNodeUpdateFiles; update the log/expect strings that mention
AppliedFilesAndOS (near the use of fileCondition and the o.Expect that checks
its status) to reference the new name "AppliedFiles" or use the constant
mcfgv1.MachineConfigNodeUpdateFiles for clarity so the framework.Logf and
o.Expect error message match the actual condition type obtained by
GetMCNCondition(degradedNodeMCN, mcfgv1.MachineConfigNodeUpdateFiles).
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Pro
Run ID: 59f9947e-4566-419b-990d-b61cbd44b5ee
📒 Files selected for processing (1)
test/extended/machine_config/machine_config_node.go
|
Scheduling required tests: |
|
@isabella-janssen: This PR was included in a payload test run from openshift/machine-config-operator#5744
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/7cc698d0-18c5-11f1-8a6e-27135da56f0c-0 |
|
@isabella-janssen: This PR was included in a payload test run from openshift/machine-config-operator#5744
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/5cb34500-18d1-11f1-8d75-08a9c4281b29-0 |
|
/verified by payloads See #30841 (comment). |
openshift-ci-robot
added
the
verified
|
@isabella-janssen: This PR has been marked as verified by DetailsIn response to this:
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. |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: isabella-janssen, pablintino The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest-required |
7 similar comments
|
/retest-required |
|
/retest-required |
|
/retest-required |
|
/retest-required |
|
/retest-required |
|
/retest-required |
|
/retest-required |
|
/retest-required |
|
/override ci/prow/e2e-aws-ovn-microshift |
|
@xueqzhan: Overrode contexts on behalf of xueqzhan: ci/prow/e2e-aws-ovn-microshift DetailsIn response to this:
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. |
|
@isabella-janssen: Jira Issue Verification Checks: Jira Issue OCPBUGS-77839 Jira Issue OCPBUGS-77839 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓 DetailsIn response to this:
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: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
4 participants
This updates the MCO's
Should properly report MCN conditions on node degradetest to reference the newMachineConfigNodeUpdateFilescondition added in openshift/machine-config-operator#5411 and remove the legacyMachineConfigNodeUpdateFilesAndOScondition removed in the same PR.