upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-02-18 18:28:18 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #134162 from zeqian-meng/update-npb-ep-image

Browse source 
Upgrade Debian and NPB for npb-ep e2e test
This commit is contained in:
Kubernetes Prow Robot 2026-01-08 13:21:38 +05:30 committed by GitHub
commit 97bd924010
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/images/node-perf/npb-ep/BASEIMAGE
View file

@ -1,4 +1,4 @@
linux/amd64=debian:stretch-slim
linux/arm64=arm64v8/debian:stretch-slim
linux/ppc64le=ppc64le/debian:stretch-slim
linux/s390x=s390x/debian:stretch-slim
linux/amd64=debian:buster-slim
linux/arm64=arm64v8/debian:buster-slim
linux/ppc64le=ppc64le/debian:buster-slim
linux/s390x=s390x/debian:buster-slim

20
test/images/node-perf/npb-ep/Dockerfile
View file

@ -17,16 +17,22 @@ FROM $BASEIMAGE as build_node_perf_npb_ep
CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
RUN apt-get update && apt-get install -y build-essential gfortran
RUN rm -f /etc/apt/sources.list
RUN echo "deb [trusted=yes] http://archive.debian.org/debian buster main" >> /etc/apt/sources.list
RUN echo "deb-src [trusted=yes] http://archive.debian.org/debian buster main" >> /etc/apt/sources.list
RUN echo "deb [trusted=yes] http://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list
RUN echo "deb-src [trusted=yes] http://archive.debian.org/debian buster-updates main" >> /etc/apt/sources.list
ADD http://www.nas.nasa.gov/assets/npb/NPB3.3.1.tar.gz .
RUN tar xzf NPB3.3.1.tar.gz
RUN apt-get update && apt-get install -y --allow-downgrades libbz2-1.0=1.0.6-9.2~deb10u1 libc6=2.28-10+deb10u1 libc6-dev g++ bzip2 dpkg-dev gfortran-8 build-essential gfortran
WORKDIR ./NPB3.3.1/NPB3.3-OMP
ADD http://www.nas.nasa.gov/assets/npb/NPB3.4.3.tar.gz .
RUN tar xzf NPB3.4.3.tar.gz
WORKDIR ./NPB3.4.3/NPB3.4-OMP
RUN if [ $(arch) != "x86_64" ]; then \
sed s/-mcmodel=medium//g config/NAS.samples/make.def.gcc_x86 > config/make.def; \
sed s/-mcmodel=medium//g config/NAS.samples/make.def_gcc > config/make.def; \
else \
cp config/NAS.samples/make.def.gcc_x86 config/make.def; \
cp config/NAS.samples/make.def_gcc config/make.def; \
fi
RUN make EP CLASS=D
@ -36,7 +42,7 @@ RUN mkdir -p /lib-copy && find /usr/lib -name "*.so.*" -exec cp {} /lib-copy \;
FROM $BASEIMAGE
COPY --from=build_node_perf_npb_ep /NPB3.3.1/NPB3.3-OMP/bin/ep.D.x /
COPY --from=build_node_perf_npb_ep /NPB3.4.3/NPB3.4-OMP/bin/ep.D.x /
COPY --from=build_node_perf_npb_ep /lib-copy /lib-copy
ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/lib-copy"

2
test/images/node-perf/npb-ep/VERSION
View file

@ -1 +1 @@
1.2
1.3