Skip to content

Commit 23a382f

Browse files
Update CI to use Go 1.25
Updates .ci-operator.yaml to use golang-1.25 build root image to match the go.mod requirement of Go 1.25.6. This fixes CI failures where Go 1.24.11 was being used.
1 parent da0c21f commit 23a382f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-9-release-golang-1.24-openshift-4.22
4+
tag: rhel-9-release-golang-1.25-openshift-4.22

Dockerfile.rhel7

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE IS GENERATED FROM Dockerfile DO NOT EDIT
22
# Use RHEL 9 as the primary builder base for the Machine Config Operator
3-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS rhel9-builder
3+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS rhel9-builder
44
ARG TAGS=""
55
WORKDIR /go/src/github.com/openshift/machine-config-operator
66
COPY . .
@@ -11,7 +11,7 @@ ENV GOMODCACHE="/go/rhel9/pkg/mod"
1111
RUN make install DESTDIR=./instroot-rhel9 && tar -C instroot-rhel9 -cf instroot-rhel9.tar .
1212

1313
# Add a RHEL 8 builder to compile the RHEL 8 compatible binaries
14-
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.22 AS rhel8-builder
14+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.25-openshift-4.22 AS rhel8-builder
1515
ARG TAGS=""
1616
WORKDIR /go/src/github.com/openshift/machine-config-operator
1717
# Copy the RHEL 8 machine-config-daemon binary and rename

0 commit comments

Comments
 (0)