Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update centos docker tag to v8 - abandoned #8

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

chore(deps): update centos docker tag to v8 - abandoned #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
396cced
Create Dockerfile.konflux
shajmakh Jan 15, 2025
47917a4
Update Dockerfile.konflux
shajmakh Jan 15, 2025
1f4dbb7
Update Dockerfile.konflux
shajmakh Jan 15, 2025
22f62fd
Update Dockerfile.konflux
shajmakh Jan 15, 2025
2ca9d0e
Update Dockerfile.konflux
shajmakh Jan 15, 2025
6366cac
Update Dockerfile.konflux -revert
shajmakh Jan 17, 2025
0ee84fa
chore(deps): update centos docker tag to v8
red-hat-konflux[bot] Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cnf-tests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ COPY . .
RUN make test-bin

# Build latency-test binaries
FROM centos:7 as builder-latency-test-tools
FROM centos:8 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
Expand All @@ -76,7 +76,7 @@ RUN yum install -y numactl-devel make gcc && \
FROM quay.io/openshift/origin-oc-rpms:4.19 AS oc

# Final image
FROM centos:7
FROM centos:8

# python3 is needed for hwlatdetect
RUN yum install -y lksctp-tools iproute libhugetlbfs-utils libhugetlbfs tmux ethtool ping numactl-libs linuxptp iperf3 python3 nc iptables && \
Expand Down
51 changes: 51 additions & 0 deletions cnf-tests/Dockerfile.konflux
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
FROM brew.registry.redhat.io/rh-osbs/openshift-ose-cli-rhel9:v4.19 AS oc
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.23.2 AS builder

ENV PKG_PATH=/go/src/github.com/openshift-kni/cnf-features-deploy
ENV UTILS_PATH=$PKG_PATH/cnf-tests/pod-utils

WORKDIR $PKG_PATH
COPY . .

ENV GOFLAGS="-mod=vendor"
RUN make test-bin

WORKDIR ${UTILS_PATH}/stresser
RUN go build -mod=vendor -o /stresser

WORKDIR ${UTILS_PATH}/sctptester
RUN go build -mod=vendor -o /sctptest

WORKDIR ${UTILS_PATH}/hugepages-allocator
RUN go build -mod=vendor -o /hugepages-allocator

WORKDIR ${UTILS_PATH}
RUN go build -mod=vendor -o /oslat-runner oslat-runner/main.go && \
go build -mod=vendor -o /cyclictest-runner cyclictest-runner/main.go && \
go build -mod=vendor -o /hwlatdetect-runner hwlatdetect-runner/main.go

FROM registry.redhat.io/ubi9/ubi-minimal:9.5

RUN mkdir -p /usr/local/etc/cnf

COPY --from=oc /usr/bin/oc /usr/bin/oc
COPY --from=builder ${PKG_PATH}/cnf-tests/submodules/cluster-node-tuning-operator/build/_output/bin/latency-e2e.test /usr/bin/latency-e2e.test
COPY --from=builder ${PKG_PATH}/cnf-tests/entrypoint/test-run.sh /usr/bin/test-run.sh
COPY --from=builder ${PKG_PATH}/cnf-tests/bin/mirror /usr/bin/mirror
COPY --from=builder ${PKG_PATH}/cnf-tests/mirror/images.json /usr/local/etc/cnf
COPY --from=builder ${UTILS_PATH}/oslat-runner /usr/bin/oslat-runner
COPY --from=builder ${UTILS_PATH}/cyclictest-runner /usr/bin/cyclictest-runner
COPY --from=builder ${UTILS_PATH}/hwlatdetect-runner /usr/bin/hwlatdetect-runner
COPY --from=builder ${UTILS_PATH}/stresser/stresser /usr/bin/stresser
COPY --from=builder ${UTILS_PATH}/sctptester/sctptest /usr/bin/sctptest
COPY --from=builder ${UTILS_PATH}/sctptester/hugepages-allocator /usr/bin/hugepages-allocator

RUN sed -i 's/quay.io\/openshift-kni\//registry.redhat.io\/openshift4\//g' /usr/local/etc/cnf/images.json
RUN sed -i 's/cnf-tests:4.19/cnf-tests-rhel9:v4.19/g' /usr/local/etc/cnf/images.json
RUN sed -i 's/dpdk:4.19/dpdk-base-rhel8:v4.19/g' /usr/local/etc/cnf/images.json

ENV IMAGE_REGISTRY=registry.redhat.io/openshift4/
ENV CNF_TESTS_IMAGE=cnf-tests-rhel9:v4.19
ENV DPDK_TESTS_IMAGE=dpdk-base-rhel8:v4.19

CMD ["/usr/bin/test-run.sh"]