test 5.0 cri-o revert#80786
Conversation
WalkthroughThe script gains two additions: a heredoc that applies a ChangesMachineConfig RHCOS patch and cluster stability wait
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Suggested reviewers
🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mcornea 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 |
openshift-ci
Bot
added
the
approved
|
[REHEARSALNOTIFIER]
A total of 715 jobs have been affected by this change. The above listing is non-exhaustive and limited to 25 jobs. A full list of affected jobs can be found here Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
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
`@ci-operator/step-registry/openshift-qe/workers-infra-workload/openshift-qe-workers-infra-workload-commands.sh`:
- Around line 553-585: Remove the echo statement containing the developer name
"mcornea" on line 553, as it indicates this is temporary test code in shared
infrastructure. Either remove the entire oc apply block with the MachineConfig
resources for os-layer-custom-worker, os-layer-custom-master, and
os-layer-custom-infra if this is a temporary test, or if this change is intended
to be permanent, remove the developer attribution from the echo statement and
add documentation explaining what the hardcoded osImageURL digest is pinning to
and the rationale for using it.
🪄 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 YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 57fa0cc8-076e-46c1-ae9a-46f8c3766fba
📒 Files selected for processing (1)
ci-operator/step-registry/openshift-qe/workers-infra-workload/openshift-qe-workers-infra-workload-commands.sh
| echo "mcornea patching rhcos version with cri-o 1.35.2-5.rhaos4.22 and wait" | ||
| # Apply the changes | ||
| oc apply -f- <<EOF | ||
| apiVersion: v1 | ||
| items: | ||
| - apiVersion: machineconfiguration.openshift.io/v1 | ||
| kind: MachineConfig | ||
| metadata: | ||
| labels: | ||
| machineconfiguration.openshift.io/role: worker | ||
| name: os-layer-custom-worker | ||
| spec: | ||
| osImageURL: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81e97c192d3fed112c182dba8c4bbbbb6b1c15dfb3cf9ee4f3585267ba53ef16 | ||
| - apiVersion: machineconfiguration.openshift.io/v1 | ||
| kind: MachineConfig | ||
| metadata: | ||
| labels: | ||
| machineconfiguration.openshift.io/role: master | ||
| name: os-layer-custom-master | ||
| spec: | ||
| osImageURL: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81e97c192d3fed112c182dba8c4bbbbb6b1c15dfb3cf9ee4f3585267ba53ef16 | ||
| - apiVersion: machineconfiguration.openshift.io/v1 | ||
| kind: MachineConfig | ||
| metadata: | ||
| labels: | ||
| machineconfiguration.openshift.io/role: infra | ||
| name: os-layer-custom-infra | ||
| spec: | ||
| osImageURL: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81e97c192d3fed112c182dba8c4bbbbb6b1c15dfb3cf9ee4f3585267ba53ef16 | ||
| kind: List | ||
| metadata: | ||
| resourceVersion: "" | ||
| EOF |
There was a problem hiding this comment.
Test/debug code appears to be intended for merge into shared infrastructure.
The echo on line 553 containing "mcornea patching..." indicates this is developer-specific test code. Based on the PR title "test 5.0 cri-o revert", this appears to be a temporary testing change rather than a permanent addition to the step registry.
Key concerns:
- Developer name in echo statement suggests this is not production-ready
- Hardcoded
osImageURLdigest with no documentation explaining what cri-o version or RHCOS content it pins to - This modifies shared QE infrastructure that other jobs depend on
If this is meant to be a temporary test, consider using a separate test workflow or configuration variant instead of modifying the shared step. If this change is intended to be permanent, please remove the developer attribution and add documentation about the pinned image.
🤖 Prompt for 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.
In
`@ci-operator/step-registry/openshift-qe/workers-infra-workload/openshift-qe-workers-infra-workload-commands.sh`
around lines 553 - 585, Remove the echo statement containing the developer name
"mcornea" on line 553, as it indicates this is temporary test code in shared
infrastructure. Either remove the entire oc apply block with the MachineConfig
resources for os-layer-custom-worker, os-layer-custom-master, and
os-layer-custom-infra if this is a temporary test, or if this change is intended
to be permanent, remove the developer attribution from the echo statement and
add documentation explaining what the hardcoded osImageURL digest is pinning to
and the rationale for using it.
|
/pj-rehearse periodic-ci-openshift-eng-ocp-qe-perfscale-ci-main-aws-5.0-nightly-x86-payload-control-plane-6nodes |
|
@mcornea: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
/pj-rehearse periodic-ci-openshift-eng-ocp-qe-perfscale-ci-main-aws-5.0-nightly-x86-payload-control-plane-6nodes |
|
@mcornea: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@mcornea: The following test failed, say
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. |
1 participant
Summary by CodeRabbit
This PR modifies the OpenShift QE infrastructure provisioning step to patch the cri-o container runtime across the cluster. Specifically, it updates the
openshift-qe/workers-infra-workloadCI step used during OpenShift 5.0 test deployments.What Changed:
The script now applies three
MachineConfigresources (for worker, master, and infra node roles) that update the RHCOS/OS image to a specific build containing cri-o version 1.35.2-5.rhaos4.22. These machine configs are applied viaoc apply -f-after the existing node and machineset provisioning logic.Additionally, the script adds a cluster stabilization wait step (
oc adm wait-for-stable-cluster --minimum-stable-period 2m) at the end to ensure the cluster has settled after applying the OS image updates.Impact:
This affects the CI infrastructure used for OpenShift QE testing, specifically the infrastructure workload provisioning pipeline. The change ensures that test clusters being deployed for quality engineering validation run a specific version of cri-o, which is important for testing cri-o-related changes or verifying compatibility in the 5.0 release cycle.