OCPBUGS-99899: add os name exception for runc jobs - #31479
Conversation
|
Pipeline controller notification For optional jobs, comment This repository is configured in: automatic mode |
openshift-ci
Bot
added
the
approved
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
🚧 Files skipped from review as they are similar to previous changes (1)
WalkthroughThe standalone node OS validator now maps job names containing ChangesStandalone node OS validation
Estimated code review effort: 1 (Trivial) | ~2 minutes Suggested reviewers: 🚥 Pre-merge checks | ✅ 14 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (14 passed)
✨ 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 |
![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 `@test/extended/ci/job_names.go`:
- Around line 276-277: Update the stream-selection logic around
validateStandaloneNodeOS so runc-rhcos10-guard is matched by the runc exception
before the rhcos10 condition, selecting rhel-9. Preserve the existing rhcos10
mapping for other job names.
🪄 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: Pro Plus
Run ID: fdb5a624-332b-4e61-9882-ca8634d50360
📒 Files selected for processing (1)
test/extended/ci/job_names.go
| } else if strings.Contains(jobName, "runc") { | ||
| targetStream = "rhel-9" |
There was a problem hiding this comment.
🎯 Functional Correctness | 🟠 Major | ⚡ Quick win
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
set -euo pipefail
rg -nP 'runc.*rhcos(?:9|10)|rhcos(?:9|10).*runc' .Repository: openshift/origin
Length of output: 652
🏁 Script executed:
#!/bin/bash
set -euo pipefail
# Inspect the relevant function and related job-name marker usage without running repository code.
wc -l test/extended/ci/job_names.go
sed -n '240,300p' test/extended/ci/job_names.go
printf '\n--- occurrences ---\n'
rg -n 'func .*jobName|targetStream|rhcos10|rhcos9|runc-rhcos10|container|rhcos10-guard|runc' test/extended/ci/job_names.go test/extended/node/runc_upgrade_cases.goRepository: openshift/origin
Length of output: 11195
🏁 Script executed:
#!/bin/bash
set -euo pipefail
python3 - <<'PY'
from pathlib import Path
p = Path('test/extended/node/runc_upgrade_cases.go')
text = p.read_text()
for line in text.splitlines():
if 'runcRHCOS10GuardPool' in line:
print('Const line:', line.strip())
if '"runc-rhcos10-guard"' in line:
print('Job-name literal:', line.strip())
def target_stream(job_name: str) -> str:
target_stream_var = "rhel-10"
if "rhcos10" in job_name:
target_stream_var = "rhel-10"
elif "rhcos9" in job_name:
target_stream_var = "rhel-9"
elif "runc" in job_name:
target_stream_var = "rhel-9"
return target_stream_var
job = "runc-rhcos10-guard"
print("validateStandaloneNodeOS targetStream selected for", job, "=>", target_stream(job))
PYRepository: openshift/origin
Length of output: 1667
Fix the job-name stream selection for runc-rhcos10-guard.
validateStandaloneNodeOS uses rhcos10 before runc, so runc-rhcos10-guard selects rhel-10 even though this guard pool is rhel-9 backed. Move the runc exception higher or handle this guard/job name explicitly.
🤖 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 `@test/extended/ci/job_names.go` around lines 276 - 277, Update the
stream-selection logic around validateStandaloneNodeOS so runc-rhcos10-guard is
matched by the runc exception before the rhcos10 condition, selecting rhel-9.
Preserve the existing rhcos10 mapping for other job names.
|
/payload-job periodic-ci-openshift-release-main-nightly-5.0-e2e-aws-serial-runc |
|
@cpmeadors: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/21ac6600-8f53-11f1-8ad8-61bf9eadfe34-0 |
|
@cpmeadors since you have this open we may want to consult with @petr-muller as I'm seeing our 4.23 jobs now failing on this test |
| targetStream = "rhel-10" | ||
| } else if strings.Contains(jobName, "rhcos9") { | ||
| targetStream = "rhel-9" | ||
| } else if strings.Contains(jobName, "runc") { |
There was a problem hiding this comment.
I wonder if we can do -runc- or at least -runc to avoid running into some weird unwanted component or test substring case
There was a problem hiding this comment.
yes. that makes sense.
There was a problem hiding this comment.
done. I did some exploratory checking on jobs names with searches in sippy. "-runc" seemed the best choice.
|
Scheduling required tests: |
cpmeadors
changed the title
openshift-ci-robot
added
jira/valid-reference
|
@cpmeadors: This pull request references Jira Issue OCPBUGS-99899, which is valid. The bug has been moved to the POST state. 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. |
b11a9a9 to
55a8cfb
Compare
|
@cpmeadors: This pull request references Jira Issue OCPBUGS-99899, which is valid. 3 validation(s) were run on this bug
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. |
|
Scheduling required tests: |
|
/verified by "prow job name should match os version", specifically in https://pr-payload-tests.ci.openshift.org/runs/ci/21ac6600-8f53-11f1-8ad8-61bf9eadfe34-0 |
openshift-ci-robot
added
the
verified
|
@cpmeadors: 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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cpmeadors, petr-muller 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 |
|
@cpmeadors: 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. |
|
@cpmeadors: Jira Issue Verification Checks: Jira Issue OCPBUGS-99899 Jira Issue OCPBUGS-99899 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. |
4 participants
[sig-ci] [Early] prow job name should match os version [Suite:openshift/conformance/parallel] test fails on runc jobs because 5.0 runc jobs use rhel-9 stream since runc is not in rhel-10. This adds another conditional for jobs with runc in their name to the check in validateStandaloneNodeOS().
Summary by CodeRabbit
-runcare correctly associated with the RHEL 9 operating system stream.