Add rhcos10 node & platform jobs to test in PR#80528
Conversation
WalkthroughThe CI operator config for ChangesComplianceAsCode CI Config: OCP 4.22 Baseline and RHCOS 10 Jobs
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related PRs
🚥 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)
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. Comment |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Anna-Koudelkova 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 235 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: |
|
/pj-rehearse pull-ci-ComplianceAsCode-content-master-e2e-aws-openshift-platform-compliance-rhcos10 |
|
@Anna-Koudelkova: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
![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/config/ComplianceAsCode/content/ComplianceAsCode-content-master.yaml`:
- Around line 85-110: Both RHCOS 10 compliance jobs are missing critical
configuration to test the PR's content changes. In the
e2e-aws-openshift-platform-compliance-rhcos10 job (lines 85-110), add an
ocp4-content-ds dependency block in the test step's dependencies section (after
the line 90 area, following the pattern used in the existing platform compliance
job) and add the flag -content-image="$CONTENT_IMAGE" to the go test command.
Similarly, in the e2e-aws-openshift-node-compliance-rhcos10 job (lines 111-136),
add the same ocp4-content-ds dependency block in the test step's dependencies
section (after the line 116 area, following the pattern used in the existing
node compliance job) and add the same -content-image="$CONTENT_IMAGE" flag to
its go test command. This ensures both jobs will test against the PR's actual
ComplianceAsCode content rather than defaults.
🪄 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: 5caa599c-2c5d-421f-b880-9b26e8205a70
⛔ Files ignored due to path filters (1)
ci-operator/jobs/ComplianceAsCode/content/ComplianceAsCode-content-master-presubmits.yamlis excluded by!ci-operator/jobs/**
📒 Files selected for processing (1)
ci-operator/config/ComplianceAsCode/content/ComplianceAsCode-content-master.yaml
| - always_run: false | ||
| as: e2e-aws-openshift-platform-compliance-rhcos10 | ||
| steps: | ||
| cluster_profile: quay-aws | ||
| dependencies: | ||
| OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE: release:nightly-latest | ||
| env: | ||
| BASE_DOMAIN: quay.devcluster.openshift.com | ||
| COMPUTE_NODE_REPLICAS: "2" | ||
| FEATURE_SET: TechPreviewNoUpgrade | ||
| OS_IMAGE_STREAM: rhel-10 | ||
| test: | ||
| - as: test | ||
| cli: latest | ||
| commands: | | ||
| set -x | ||
| export CONTENT_DIRECTORY=$PWD | ||
| git clone https://github.com/ComplianceAsCode/ocp4e2e.git ocp4e2e | ||
| pushd ocp4e2e; make install-jq | ||
| INSTALL_OPERATOR=${INSTALL_OPERATOR:-true} | ||
| PATH=$PATH:/tmp/bin go test -v -timeout 240m . -run=^TestPlatformCompliance$ -install-operator=${INSTALL_OPERATOR} -test-type="platform" -content-directory="$CONTENT_DIRECTORY" | ||
| from: src | ||
| resources: | ||
| requests: | ||
| cpu: 100m | ||
| workflow: ipi-aws |
There was a problem hiding this comment.
Missing content image dependency in both RHCOS 10 compliance jobs. Both new RHCOS 10 jobs omit the ocp4-content-ds image dependency and the -content-image test flag, meaning they will not test the PR's ComplianceAsCode content changes—only default/missing content.
ci-operator/config/ComplianceAsCode/content/ComplianceAsCode-content-master.yaml#L85-L110: Add theocp4-content-dsdependency block after Line 90 (in the test step'sdependencies:list, similar to lines 54-56 in the existing platform job) and include-content-image="$CONTENT_IMAGE"in thego testcommand on Line 105.ci-operator/config/ComplianceAsCode/content/ComplianceAsCode-content-master.yaml#L111-L136: Add theocp4-content-dsdependency block after Line 116 (in the test step'sdependencies:list, similar to lines 77-79 in the existing node job) and include-content-image="$CONTENT_IMAGE"in thego testcommand on Line 131.
📍 Affects 1 file
ci-operator/config/ComplianceAsCode/content/ComplianceAsCode-content-master.yaml#L85-L110(this comment)ci-operator/config/ComplianceAsCode/content/ComplianceAsCode-content-master.yaml#L111-L136
🤖 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/config/ComplianceAsCode/content/ComplianceAsCode-content-master.yaml`
around lines 85 - 110, Both RHCOS 10 compliance jobs are missing critical
configuration to test the PR's content changes. In the
e2e-aws-openshift-platform-compliance-rhcos10 job (lines 85-110), add an
ocp4-content-ds dependency block in the test step's dependencies section (after
the line 90 area, following the pattern used in the existing platform compliance
job) and add the flag -content-image="$CONTENT_IMAGE" to the go test command.
Similarly, in the e2e-aws-openshift-node-compliance-rhcos10 job (lines 111-136),
add the same ocp4-content-ds dependency block in the test step's dependencies
section (after the line 116 area, following the pattern used in the existing
node compliance job) and add the same -content-image="$CONTENT_IMAGE" flag to
its go test command. This ensures both jobs will test against the PR's actual
ComplianceAsCode content rather than defaults.
|
/pj-rehearse pull-ci-ComplianceAsCode-content-master-e2e-aws-openshift-node-compliance-rhcos10 |
|
@Anna-Koudelkova: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
|
@Anna-Koudelkova: 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. |
1 participant
Not sure if we need this update (seems to me like these are working when triggered and does not have cluster issues), but for master branch I would at least still update the general config at the beginning of the yaml file - it worked with 4.16 versions and I am not sure if that was intentional or some remains of an older age.
Summary by CodeRabbit
This PR updates the OpenShift CI configuration for the ComplianceAsCode/content repository's master branch. It makes two primary changes:
1. Baseline Updates
rhel-9-release-golang-1.24-openshift-4.22(from an older Go 1.23/OpenShift 4.16 baseline)2. New RHCOS 10 Test Coverage
e2e-aws-openshift-platform-compliance-rhcos10ande2e-aws-openshift-node-compliance-rhcos10) to test compliance with Red Hat CoreOS 10 (RHEL 10)always_run: false), allowing validation of RHCOS 10 compatibility without blocking PR mergesThe author notes some uncertainty about the necessity of these changes, suggesting that existing jobs may already be functioning adequately and that configuration updates for master branch baseline may be discretionary.