Merge pull request #3821 from abraham2512/fix-main-ci

infra: update ci to fedora42 image

Author: openshift-merge-bot[bot]

cnf-tests/Dockerfile.openshift

@@ -78,20 +78,6 @@ WORKDIR /app
 COPY . .
 RUN make test-bin
 
-# Build latency-test binaries
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 as builder-latency-test-tools
-
-ENV RT_TESTS_URL=https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/snapshot
-ENV RT_TESTS_PKG=rt-tests-2.0
-
-RUN yum install -y numactl-devel make gcc && \
-      curl -O $RT_TESTS_URL/$RT_TESTS_PKG.tar.gz && \
-      tar -xvf $RT_TESTS_PKG.tar.gz && \
-      cd $RT_TESTS_PKG && \
-      make oslat hwlatdetect cyclictest && \
-      cp oslat /oslat && \
-      cp hwlatdetect /hwlatdetect && \
-      cp cyclictest /cyclictest
 
 FROM registry.ci.openshift.org/ocp/4.22:oc-rpms AS oc
 
@@ -104,7 +90,7 @@ ENV CNF_TESTS_IMAGE=cnf-tests:${OCP_VERSION}
 ENV DPDK_TESTS_IMAGE=dpdk:${OCP_VERSION}
 
 # python3 is needed for hwlatdetect
-RUN yum install -y lksctp-tools iproute tmux ethtool iputils numactl-libs iptables kmod linuxptp iperf3 python3 nc nftables findutils && \
+RUN yum install -y lksctp-tools iproute tmux ethtool iputils numactl-libs iptables kmod linuxptp iperf3 python3 nc nftables findutils realtime-tests && \
     yum clean all
 
 RUN mkdir -p /usr/local/etc/cnf
@@ -113,13 +99,10 @@ COPY --from=builder-stresser /stresser /usr/bin/stresser
 COPY --from=builder-sctptester /sctptest /usr/bin/sctptest
 
 COPY --from=builder-latency-test-runners /oslat-runner /usr/bin/oslat-runner
-COPY --from=builder-latency-test-tools /oslat /usr/bin/oslat
 
 COPY --from=builder-latency-test-runners /cyclictest-runner /usr/bin/cyclictest-runner
-COPY --from=builder-latency-test-tools /cyclictest /usr/bin/cyclictest
 
 COPY --from=builder-latency-test-runners /hwlatdetect-runner /usr/bin/hwlatdetect-runner
-COPY --from=builder-latency-test-tools /hwlatdetect /usr/bin/hwlatdetect
 
 COPY --from=oc /go/src/github.com/openshift/oc/oc /usr/bin/oc
 

openshift-ci/Dockerfile.tools

@@ -1,5 +1,5 @@
 # The fedora version used should provide the golang version that matches $GOVERSION
-FROM quay.io/fedora/fedora:41
+FROM quay.io/fedora/fedora:42
 
 ENV GOPATH /go
 ENV GOBIN /go/bin