From 2b9c8c423e271d48c6679835cd369bb21b399d7c Mon Sep 17 00:00:00 2001 From: lufreita Date: Tue, 31 Mar 2026 14:31:08 -0300 Subject: [PATCH 1/2] OCM-22871 | chore: bump ROSA CI build root to Go 1.26 Move the openshift/release ci-operator build root for openshift/rosa from the Go 1.24 builder to the Go 1.26 builder so ROSA presubmits run with a toolchain that satisfies the repository's Go 1.26.1 requirement. Made-with: Cursor --- ci-operator/config/openshift/rosa/openshift-rosa-master.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml b/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml index 4277f55cfbd3f..0cf23b2ba392b 100644 --- a/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml +++ b/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml @@ -7,7 +7,7 @@ build_root: image_stream_tag: name: builder namespace: ocp - tag: rhel-9-golang-1.24-openshift-4.21 + tag: rhel-9-golang-1.26-openshift-4.21 resources: '*': requests: From 7ad01a4e6129154fb141b95c36c427cdbd6b1864 Mon Sep 17 00:00:00 2001 From: lufreita Date: Tue, 31 Mar 2026 15:53:45 -0300 Subject: [PATCH 2/2] OCM-22871 | fix: restore ROSA presubmits to an available builder The 4.21 Go 1.26 builder tag does not exist in OpenShift CI, so ROSA presubmits now fail before any job steps can run. Switch back to the available Go 1.25 builder stream and export GOTOOLCHAIN=auto in the Go-based jobs so they can still resolve the 1.26.1 toolchain required by the repo. Made-with: Cursor --- .../config/openshift/rosa/openshift-rosa-master.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml b/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml index 0cf23b2ba392b..2faeee7addd72 100644 --- a/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml +++ b/ci-operator/config/openshift/rosa/openshift-rosa-master.yaml @@ -7,7 +7,7 @@ build_root: image_stream_tag: name: builder namespace: ocp - tag: rhel-9-golang-1.26-openshift-4.21 + tag: rhel-9-golang-1.25-openshift-4.21 resources: '*': requests: @@ -16,6 +16,7 @@ resources: tests: - as: lint commands: | + export GOTOOLCHAIN=auto export GOLANGCI_LINT_CACHE=/tmp/.cache unset GOFLAGS make lint @@ -23,12 +24,14 @@ tests: from: src - as: build commands: | + export GOTOOLCHAIN=auto unset GOFLAGS make container: from: src - as: test commands: | + export GOTOOLCHAIN=auto make test verify container: from: src @@ -39,6 +42,7 @@ tests: from: src - as: coverage commands: | + export GOTOOLCHAIN=auto export CODECOV_TOKEN=$(cat /tmp/secret/CODECOV_TOKEN) make codecov container: @@ -48,6 +52,7 @@ tests: name: rosa-codecov-token - as: publish-coverage commands: | + export GOTOOLCHAIN=auto export CODECOV_TOKEN=$(cat /tmp/secret/CODECOV_TOKEN) make codecov container: