Skip to content

Commit 88bbdfb

Browse files
Merge pull request #3194 from shajmakh/fix-go-builders-us-4.20
cnf-tests: use go 1.24 builders for 4.20
2 parents 834f168 + 9c96e42 commit 88bbdfb

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

cnf-tests/Dockerfile.openshift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This dockerfile is specific to building the OpenShift CNF stresser image
2-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 as builder-stresser
2+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 as builder-stresser
33

44
# Add everything
55
ENV PKG_NAME=github.com/openshift-kni/cnf-features-deploy
@@ -14,7 +14,7 @@ WORKDIR $STRESSER_PATH
1414
RUN go build -mod=vendor -o /stresser
1515

1616
# This dockerfile is specific to building the OpenShift CNF sctp tester image
17-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 as builder-sctptester
17+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 as builder-sctptester
1818

1919
# Add everything
2020
ENV PKG_NAME=github.com/openshift-kni/cnf-features-deploy
@@ -29,7 +29,7 @@ WORKDIR $TESTER_PATH
2929
RUN go build -mod=vendor -o /sctptest
3030

3131
# build hugepages-allocator's binary
32-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 AS builder-hugepages-allocator
32+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder-hugepages-allocator
3333

3434
ENV PKG_NAME=github.com/openshift-kni/cnf-features-deploy
3535
ENV PKG_PATH=/go/src/$PKG_NAME
@@ -43,7 +43,7 @@ WORKDIR $TOOL_PATH
4343
RUN go build -mod=vendor -o /hugepages-allocator
4444

4545
# build machineinfo's binary
46-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 AS builder-machineinfo
46+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder-machineinfo
4747

4848
ENV PKG_NAME=github.com/openshift-kni/cnf-features-deploy
4949
ENV PKG_PATH=/go/src/$PKG_NAME
@@ -57,7 +57,7 @@ WORKDIR $TOOL_PATH
5757
RUN go build -mod=vendor -o /machineinfo
5858

5959
# build latency-test's runner binaries
60-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 AS builder-latency-test-runners
60+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder-latency-test-runners
6161

6262
ENV PKG_NAME=github.com/openshift-kni/cnf-features-deploy
6363
ENV PKG_PATH=/go/src/$PKG_NAME
@@ -73,13 +73,13 @@ RUN go build -mod=vendor -o /oslat-runner oslat-runner/main.go && \
7373
go build -mod=vendor -o /hwlatdetect-runner hwlatdetect-runner/main.go
7474

7575
# build latency testing suite
76-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 AS go-builder
76+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS go-builder
7777
WORKDIR /app
7878
COPY . .
7979
RUN make test-bin
8080

8181
# Build latency-test binaries
82-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.20 as builder-latency-test-tools
82+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 as builder-latency-test-tools
8383

8484
ENV RT_TESTS_URL=https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot
8585
ENV RT_TESTS_PKG=rt-tests-2.0

0 commit comments

Comments
 (0)