From 5001fdc23e2267ce1a66ea95b3facf7670ca6651 Mon Sep 17 00:00:00 2001 From: Zeqian Meng <1109697+ZeqianMeng@users.noreply.github.com> Date: Fri, 19 Sep 2025 15:45:53 +0200 Subject: [PATCH 1/3] Upgrade Debian for npb-ep e2e test image --- test/images/node-perf/npb-ep/BASEIMAGE | 8 ++++---- test/images/node-perf/npb-ep/VERSION | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/images/node-perf/npb-ep/BASEIMAGE b/test/images/node-perf/npb-ep/BASEIMAGE index 3287962366f..96b0b3ab3e0 100644 --- a/test/images/node-perf/npb-ep/BASEIMAGE +++ b/test/images/node-perf/npb-ep/BASEIMAGE @@ -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:bookworm-slim +linux/arm64=arm64v8/debian:bookworm-slim +linux/ppc64le=ppc64le/debian:bookworm-slim +linux/s390x=s390x/debian:bookworm-slim diff --git a/test/images/node-perf/npb-ep/VERSION b/test/images/node-perf/npb-ep/VERSION index 5625e59da88..7e32cd56983 100644 --- a/test/images/node-perf/npb-ep/VERSION +++ b/test/images/node-perf/npb-ep/VERSION @@ -1 +1 @@ -1.2 +1.3 From 25653e7bfc5c1780dc4e04155bdf41a024d76914 Mon Sep 17 00:00:00 2001 From: Zeqian Meng <1109697+ZeqianMeng@users.noreply.github.com> Date: Wed, 8 Oct 2025 11:31:53 +0200 Subject: [PATCH 2/3] Update to Debian Buster for npb-ep image --- test/images/node-perf/npb-ep/BASEIMAGE | 8 ++++---- test/images/node-perf/npb-ep/Dockerfile | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/test/images/node-perf/npb-ep/BASEIMAGE b/test/images/node-perf/npb-ep/BASEIMAGE index 96b0b3ab3e0..0765d812577 100644 --- a/test/images/node-perf/npb-ep/BASEIMAGE +++ b/test/images/node-perf/npb-ep/BASEIMAGE @@ -1,4 +1,4 @@ -linux/amd64=debian:bookworm-slim -linux/arm64=arm64v8/debian:bookworm-slim -linux/ppc64le=ppc64le/debian:bookworm-slim -linux/s390x=s390x/debian:bookworm-slim +linux/amd64=debian:buster-slim +linux/arm64=arm64v8/debian:buster-slim +linux/ppc64le=ppc64le/debian:buster-slim +linux/s390x=s390x/debian:buster-slim diff --git a/test/images/node-perf/npb-ep/Dockerfile b/test/images/node-perf/npb-ep/Dockerfile index 1988a5d4f9c..35e4af93660 100644 --- a/test/images/node-perf/npb-ep/Dockerfile +++ b/test/images/node-perf/npb-ep/Dockerfile @@ -17,7 +17,13 @@ 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 + +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 ADD http://www.nas.nasa.gov/assets/npb/NPB3.3.1.tar.gz . RUN tar xzf NPB3.3.1.tar.gz From 3d33cb1dfe975a324d131d4f668d47ed87489905 Mon Sep 17 00:00:00 2001 From: Zeqian Meng <1109697+ZeqianMeng@users.noreply.github.com> Date: Mon, 27 Oct 2025 22:36:14 +0100 Subject: [PATCH 3/3] Update to use NPB3.4.3 --- test/images/node-perf/npb-ep/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/images/node-perf/npb-ep/Dockerfile b/test/images/node-perf/npb-ep/Dockerfile index 35e4af93660..8366bea93e6 100644 --- a/test/images/node-perf/npb-ep/Dockerfile +++ b/test/images/node-perf/npb-ep/Dockerfile @@ -25,14 +25,14 @@ RUN echo "deb-src [trusted=yes] http://archive.debian.org/debian buster-updates 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 -ADD http://www.nas.nasa.gov/assets/npb/NPB3.3.1.tar.gz . -RUN tar xzf NPB3.3.1.tar.gz +ADD http://www.nas.nasa.gov/assets/npb/NPB3.4.3.tar.gz . +RUN tar xzf NPB3.4.3.tar.gz -WORKDIR ./NPB3.3.1/NPB3.3-OMP +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 @@ -42,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"