From 4ee922d4f63689d910132d8a20a4430cd1345550 Mon Sep 17 00:00:00 2001
From: Tapasya Patki <patki1@llnl.gov>
Date: Thu, 7 Mar 2024 14:38:57 -0800
Subject: [PATCH] test/docker: Add bookworm Dockerfile with PFA installation
 steps. Add --progress=plain for testing

---
 src/test/docker/bookworm-pfa/Dockerfile | 54 +++++++++++++++++++++++++
 src/test/docker/docker-run-checks.sh    |  1 +
 2 files changed, 55 insertions(+)
 create mode 100644 src/test/docker/bookworm-pfa/Dockerfile

diff --git a/src/test/docker/bookworm-pfa/Dockerfile b/src/test/docker/bookworm-pfa/Dockerfile
new file mode 100644
index 000000000..e2c2fc4a3
--- /dev/null
+++ b/src/test/docker/bookworm-pfa/Dockerfile
@@ -0,0 +1,54 @@
+FROM fluxrm/flux-core:bookworm
+
+ARG USER=flux
+ARG UID=1000
+USER root
+
+# Install extra buildrequires for flux-sched:
+RUN apt-get update
+RUN apt-get -qq install -y --no-install-recommends \
+	libboost-graph-dev \
+	libboost-system-dev \
+	libboost-filesystem-dev \
+	libboost-regex-dev \
+	libyaml-cpp-dev \
+	libedit-dev \
+	ninja-build \
+	python3-yaml \
+	llvm-dev \
+	libssl-dev \
+	flex \
+	bison \
+	cmake 
+
+# Add configured user to image with sudo access:
+#
+RUN \
+ if test "$USER" != "flux"; then  \
+      groupadd -g $UID $USER \
+   && useradd -g $USER -u $UID -d /home/$USER -m $USER \
+   && sh -c "printf \"$USER ALL= NOPASSWD: ALL\\n\" >> /etc/sudoers" \
+   && adduser $USER sudo ; \
+ fi
+
+USER $USER
+WORKDIR /home/$USER
+
+# Install PerfFlowAspect
+RUN git clone https://github.com/flux-framework/PerfFlowAspect.git PerfFlowAspect
+WORKDIR /home/$USER/PerfFlowAspect/src/c
+RUN mkdir build-pfa
+WORKDIR /home/$USER/PerfFlowAspect/src/c/build-pfa
+RUN echo $PWD
+RUN export CC="clang-15"
+RUN export CXX="clang++-15"
+RUN export CFLAGS="-O2 -gdwarf-4"
+RUN export CXXFLAGS="-gdwarf-4"
+RUN cmake -DCMAKE_CXX_COMPILER="clang++-15" -DPERFFLOWASPECT_WITH_CUDA=OFF \ 
+	  -DCMAKE_INSTALL_PREFIX=/home/$USER/PerfFlowAspect/src/c/install-pfa ../
+RUN make 
+RUN make install
+
+WORKDIR /home/$USER
+
+
diff --git a/src/test/docker/docker-run-checks.sh b/src/test/docker/docker-run-checks.sh
index 76008d285..77a689712 100755
--- a/src/test/docker/docker-run-checks.sh
+++ b/src/test/docker/docker-run-checks.sh
@@ -148,6 +148,7 @@ checks_group "Building image $IMAGE for user $USER $(id -u) group=$(id -g)" \
     ${PLATFORM} \
     ${NO_CACHE} \
     ${QUIET} \
+    --progress=plain \
     --build-arg BASE_IMAGE=$IMAGE \
     --build-arg IMAGESRC="$BASE_DOCKER_REPO:$IMAGE" \
     --build-arg USER=$USER \