Revert "Revert "OSAC-360: Update Go version in osac-project installer config""#79843
Conversation
… config …" This reverts commit ba985fa.
openshift-ci-robot
added
the
jira/valid-reference
|
@omer-vishlitzky: This pull request references OSAC-360 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 task to target the "5.0.0" version, but no target version was set. 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. |
WalkthroughThe OSAC installer CI configuration is updated to use a newer build root image stream tag. The build environment is upgraded from RHEL 9 with Go 1.25 and OpenShift 4.21 to RHEL 9 with Go 1.26 and OpenShift 5.0. ChangesOSAC Installer Build Root Image Configuration
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~2 minutes Possibly related PRs
Suggested labels
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 |
openshift-ci
Bot
added
the
approved
|
[REHEARSALNOTIFIER]
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals. Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
@omer-vishlitzky: 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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: akshaynadkarni, omer-vishlitzky 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 |
![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/osac-project/osac-installer/osac-project-osac-installer-main.yaml`:
- Line 21: The YAML shows a version skew: build_root.image_stream_tag.tag is set
to rhel-9-release-golang-1.26-openshift-5.0 while base_images.origin-cli.name
and releases.latest.candidate.version remain "4.20"; confirm if this is
intentional, and if not update base_images.origin-cli.name and
releases.latest.candidate.version to the matching OpenShift 5.0 values (or the
correct 5.x equivalents) so they align with build_root.image_stream_tag.tag, or
add a clear comment documenting the intentional split; check and apply the same
change for the corresponding keys in the fulfillment-service config as well.
🪄 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: 6e859123-885b-40f7-b215-bae702c8f653
📒 Files selected for processing (1)
ci-operator/config/osac-project/osac-installer/osac-project-osac-installer-main.yaml
| name: release | ||
| namespace: openshift | ||
| tag: rhel-9-release-golang-1.25-openshift-4.21 | ||
| tag: rhel-9-release-golang-1.26-openshift-5.0 |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
# Description: Check version coordination patterns in similar CI configs
echo "=== Checking other osac-project configs with 5.0 build roots ==="
rg -n 'openshift-5\.0' ci-operator/config/osac-project/ -A5 -B5
echo -e "\n=== Checking if any configs use 5.0 build root with 4.20 releases ==="
fd -e yaml . ci-operator/config/osac-project/ --exec sh -c 'if rg -q "openshift-5\.0" "$1" && rg -q "version.*4\.20" "$1"; then echo "MISMATCH in: $1"; rg -n "tag.*openshift-5\.0|version.*4\.20" "$1"; fi' _ {}
echo -e "\n=== Checking typical version alignment in openshift configs ==="
rg -n 'rhel-9-release-golang-1\.26-openshift-5\.0' ci-operator/config/openshift/ -l | head -5 | while read f; do
echo "File: $f"
rg -n 'version:' "$f" | head -3
doneRepository: openshift/release
Length of output: 3234
🏁 Script executed:
#!/bin/bash
set -euo pipefail
echo "=== Files with 5.0 build root tag ==="
rg -l 'rhel-9-release-golang-1\.26-openshift-5\.0' ci-operator/config/osac-project/ | cat
for f in $(rg -l 'rhel-9-release-golang-1\.26-openshift-5\.0' ci-operator/config/osac-project/); do
echo -e "\n=== Inspecting: $f ==="
echo "--- origin-cli context ---"
rg -n 'origin-cli' "$f" -C 6 || true
echo "--- releases latest candidate version context ---"
rg -n 'releases:|latest:|candidate:|version:\s*"4\.20"' "$f" -C 6 || true
echo "--- show all version: occurrences (small) ---"
rg -n 'version:' "$f" | head -20
doneRepository: openshift/release
Length of output: 2310
Fix version skew between build_root (OpenShift 5.0) and releases/base images (4.20)
- In
ci-operator/config/osac-project/osac-installer/osac-project-osac-installer-main.yaml,build_root.image_stream_tag.tagisrhel-9-release-golang-1.26-openshift-5.0, but bothbase_images.origin-cli.nameandreleases.latest.candidate.versionremain"4.20". - The same mismatch exists in
ci-operator/config/osac-project/fulfillment-service/osac-project-fulfillment-service-main.yaml.
Confirm whether testing/building intentionally targets 4.20 while using 5.0 build tooling; otherwise, update origin-cli and releases.latest.candidate.version to align with the OpenShift 5.0 build root (or document the intentional split).
🤖 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/osac-project/osac-installer/osac-project-osac-installer-main.yaml`
at line 21, The YAML shows a version skew: build_root.image_stream_tag.tag is
set to rhel-9-release-golang-1.26-openshift-5.0 while
base_images.origin-cli.name and releases.latest.candidate.version remain "4.20";
confirm if this is intentional, and if not update base_images.origin-cli.name
and releases.latest.candidate.version to the matching OpenShift 5.0 values (or
the correct 5.x equivalents) so they align with build_root.image_stream_tag.tag,
or add a clear comment documenting the intentional split; check and apply the
same change for the corresponding keys in the fulfillment-service config as
well.
|
/pj-rehearse ack |
|
@omer-vishlitzky: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel. |
openshift-merge-bot
Bot
added
the
rehearsals-ack
3 participants
Reverts #79839