Skip to content

OCM-22871 | fix: move ROSA CI build root to OpenShift 4.22#77623

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
olucasfreitas:OCM-22871-rosa-go125-builder-fix
Apr 10, 2026
Merged

OCM-22871 | fix: move ROSA CI build root to OpenShift 4.22#77623
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
olucasfreitas:OCM-22871-rosa-go125-builder-fix

Conversation

@olucasfreitas
Copy link
Copy Markdown
Contributor

Summary

  • move the ROSA ci-operator build root from the OpenShift 4.21 Go 1.25 builder stream to the OpenShift 4.22 Go 1.25 builder stream
  • keep ROSA on the Go 1.25.x line while picking up Go 1.25.8 for the CVE remediation
  • avoid the stale 4.21 generic Go 1.25 stream, which still resolves to Go 1.25.7

Test plan

  • Verified registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21 reports GO_VERSION=v1.25.7
  • Verified registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 reports GO_VERSION=v1.25.8
  • Verified registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.22 reports GO_VERSION=v1.25.8
  • Rehearse jobs should confirm the ROSA presubmits pick up the new build root

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 9, 2026

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 9, 2026
@olucasfreitas olucasfreitas marked this pull request as ready for review April 10, 2026 14:00
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 10, 2026
Use the OpenShift 4.22 Go 1.25 builder stream for ROSA CI because the 4.21 Go 1.25 stream still resolves to Go 1.25.7, while the 4.22 generic Go 1.25 stream resolves to Go 1.25.8. This keeps Prow aligned with the fixed Go line needed for the CVE remediation.

Made-with: Cursor
@olucasfreitas olucasfreitas force-pushed the OCM-22871-rosa-go125-builder-fix branch from 04fe080 to fd885c0 Compare April 10, 2026 14:04
@openshift-ci openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 10, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@olucasfreitas: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-rosa-master-build openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-commits openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-coverage openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-e2e-presubmits-images openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-e2e-presubmits-pr-rosa-hcp-advanced openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-e2e-presubmits-pr-rosa-hcp-arm openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-e2e-presubmits-pr-rosa-hcp-private-link openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-e2e-presubmits-pr-rosa-shared-vpc openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-e2e-presubmits-pr-rosa-sts-advanced openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-e2e-presubmits-pr-rosa-sts-private-link openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-e2e-presubmits-pr-rosa-sts-shared-vpc openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-images-images openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-images-release-images openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-lint openshift/rosa presubmit Ci-operator config changed
pull-ci-openshift-rosa-master-test openshift/rosa presubmit Ci-operator config changed
periodic-ci-openshift-rosa-master-e2e-rosa-sts-advanced-prod-critical-high-f3 N/A periodic Ci-operator config changed
periodic-ci-openshift-rosa-master-e2e-rosa-hcp-arm-f7 N/A periodic Ci-operator config changed
periodic-ci-openshift-rosa-master-e2e-rosa-ocm-resources-f3 N/A periodic Ci-operator config changed
periodic-ci-openshift-rosa-master-e2e-rosa-hcp-advanced-regional-f3 N/A periodic Ci-operator config changed
periodic-ci-openshift-rosa-master-e2e-rosa-sts-advanced-medium-low-f7 N/A periodic Ci-operator config changed
periodic-ci-openshift-rosa-master-e2e-rosa-sts-private-link-medium-low-f7 N/A periodic Ci-operator config changed
periodic-ci-openshift-rosa-master-e2e-rosa-hcp-shared-vpc-medium-low-f7 N/A periodic Ci-operator config changed
periodic-ci-openshift-rosa-master-e2e-rosa-hcp-upgrade-y-stream-f3 N/A periodic Ci-operator config changed
periodic-ci-openshift-rosa-master-e2e-rosa-hcp-private-link-critical-high-f3 N/A periodic Ci-operator config changed
periodic-ci-openshift-rosa-master-e2e-rosa-sts-upgrade-y-stream-prod-f3 N/A periodic Ci-operator config changed

A total of 44 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-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@amandahla
Copy link
Copy Markdown
Contributor

/approve
/lgtm

@olucasfreitas
Copy link
Copy Markdown
Contributor Author

/pj-rehearse ack

@openshift-merge-bot
Copy link
Copy Markdown
Contributor

@olucasfreitas: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Apr 10, 2026
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 10, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 10, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amandahla, olucasfreitas

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 10, 2026

@olucasfreitas: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit c026fae into openshift:main Apr 10, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants