From c5cea1cb240a905a9825117e3c5f6f745d8cca7d Mon Sep 17 00:00:00 2001
From: Julien Bigot <julien.bigot@cea.fr>
Date: Mon, 6 Dec 2021 22:32:39 +0100
Subject: [PATCH] less para, more tests & logs

---
 .github/workflows/docker_images.yml |  4 ----
 bionic/Dockerfile                   | 11 ++++++++---
 cmake/Dockerfile                    |  6 +-----
 gcc/Dockerfile                      |  6 +-----
 libs/Dockerfile                     | 10 ++--------
 mpi/Dockerfile                      |  6 +-----
 6 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/docker_images.yml b/.github/workflows/docker_images.yml
index 74c11af3..452d2db7 100644
--- a/.github/workflows/docker_images.yml
+++ b/.github/workflows/docker_images.yml
@@ -50,7 +50,6 @@ jobs:
       run: |
         set -ex
         docker build \
-          --build-arg "PARALLELISM=3" \
           --build-arg "GCC_VERSION=$([ latest = "${GCC_VERSION}" ] || echo "@${GCC_VERSION}")" \
           --build-arg "BASE_IMAGE=pdidevel/bionic:${image_version}" \
           -t pdidevel/bionic_gcc-${GCC_VERSION} \
@@ -83,7 +82,6 @@ jobs:
       run: |
         set -ex
         docker build \
-          --build-arg "PARALLELISM=3" \
           --build-arg "BASE_IMAGE=pdidevel/bionic_${COMPILER}:${image_version}" \
           --build-arg "CMAKE_VERSION=$([ latest = "${CMAKE_VERSION}" ] || echo "@${CMAKE_VERSION}")" \
           -t pdidevel/bionic_${COMPILER}_cmake-${CMAKE_VERSION} \
@@ -119,7 +117,6 @@ jobs:
       run: |
         set -ex
         docker build \
-          --build-arg "PARALLELISM=3" \
           --build-arg "BASE_IMAGE=pdidevel/bionic_${COMPILER}_${CMAKE}:${image_version}" \
           --build-arg "MPI=openmpi$([ latest = "${OPENMPI_VERSION}" ] || echo "@${OPENMPI_VERSION}")" \
           -t pdidevel/bionic_${COMPILER}_${CMAKE}_openmpi-${OPENMPI_VERSION} \
@@ -158,7 +155,6 @@ jobs:
       run: |
         set -ex
         docker build \
-          --build-arg "PARALLELISM=3" \
           --build-arg "BASE_IMAGE=bionic_${COMPILER}_${CMAKE}_${MPI}:${image_version}" \
           --build-arg "LIBS_VERSION=${LIBS_VERSION}" \
           -t pdidevel/bionic_${COMPILER}_${CMAKE}_${MPI}_libs-${LIBS_VERSION} \
diff --git a/bionic/Dockerfile b/bionic/Dockerfile
index 93cea79c..a7a0be9b 100644
--- a/bionic/Dockerfile
+++ b/bionic/Dockerfile
@@ -1,5 +1,9 @@
 FROM ubuntu:18.04
 
+ARG SPACK_INSTALL_ARGS
+
+ENV SPACK_INSTALL_ARGS=${SPACK_INSTALL_ARGS:-"--verbose --fail-fast"}
+
 ENV DOCKERFILE_BASE=ubuntu            \
     DOCKERFILE_DISTRO=ubuntu          \
     DOCKERFILE_DISTRO_VERSION=18.04   \
@@ -46,9 +50,8 @@ RUN set -ex \
  && ln -s ${SPACK_ROOT}/share/spack/docker/entrypoint.bash /usr/local/bin/docker-shell \
  && ln -s ${SPACK_ROOT}/share/spack/docker/entrypoint.bash /usr/local/bin/interactive-shell \
  && ln -s ${SPACK_ROOT}/share/spack/docker/entrypoint.bash /usr/local/bin/spack-env \
- && mkdir -p /root/.spack \
- && cp ${SPACK_ROOT}/share/spack/docker/modules.yaml /root/.spack/modules.yaml \
  && rm -rf /root/*.* /run/nologin ${SPACK_ROOT}/.git \
+ && mkdir -p /root/.spack \
  && [ -f ~/.profile ] && ( sed -i 's/mesg n/( tty -s \&\& mesg n || true )/g' ~/.profile || true )
 
 WORKDIR /root
@@ -56,5 +59,7 @@ SHELL ["docker-shell"]
 ENTRYPOINT ["/bin/bash", "/opt/spack/share/spack/docker/entrypoint.bash"]
 CMD ["interactive-shell"]
 
-RUN spack spec hdf5+mpi \
+RUN spack install ${SPACK_INSTALL_ARGS} --reuse patchelf target=x86_64 \
+ && spack spec hdf5+mpi \
+ && spack reindex \
  && sed 's/target:.*/target: x86_64/' -i /root/.spack/linux/compilers.yaml
diff --git a/cmake/Dockerfile b/cmake/Dockerfile
index f9905244..9fae4100 100644
--- a/cmake/Dockerfile
+++ b/cmake/Dockerfile
@@ -4,15 +4,11 @@ FROM ${BASE_IMAGE}
 
 ARG CMAKE_VERSION
 ARG SPACK_INSTALL_ARGS
-ARG PARALLELISM=1
 
-ENV SPACK_INSTALL_ARGS=${SPACK_INSTALL_ARGS:-"--show-log-on-error --fail-fast"}
+ENV SPACK_INSTALL_ARGS=${SPACK_INSTALL_ARGS:-"--verbose --test=all --fail-fast"}
 ENV CMAKE=cmake${CMAKE_VERSION}
 
 SHELL ["/usr/local/bin/spack-env", "/bin/bash", "-c"]
 
 RUN set -ex \
- && for N in {2..${PARALLELISM}} \
-  ; do spack install ${SPACK_INSTALL_ARGS} --reuse "${CMAKE}%${COMPILER}" target=x86_64 \
-  & done \
  && spack install ${SPACK_INSTALL_ARGS} --reuse "${CMAKE}%${COMPILER}" target=x86_64
diff --git a/gcc/Dockerfile b/gcc/Dockerfile
index 91ac4ef9..214ccc6a 100644
--- a/gcc/Dockerfile
+++ b/gcc/Dockerfile
@@ -4,17 +4,13 @@ FROM ${BASE_IMAGE}
 
 ARG GCC_VERSION
 ARG SPACK_INSTALL_ARGS
-ARG PARALLELISM=1
 
-ENV SPACK_INSTALL_ARGS=${SPACK_INSTALL_ARGS:-"--show-log-on-error --fail-fast"}
+ENV SPACK_INSTALL_ARGS=${SPACK_INSTALL_ARGS:-"--verbose --test=all --fail-fast"}
 ENV COMPILER=gcc${GCC_VERSION}
 
 SHELL ["/usr/local/bin/spack-env", "/bin/bash", "-c"]
 
 RUN set -ex \
- && for N in {2..${PARALLELISM}} \
-  ; do spack install ${SPACK_INSTALL_ARGS} --reuse "${COMPILER}" target=x86_64 \
-  & done \
  && spack install ${SPACK_INSTALL_ARGS} --reuse "${COMPILER}" target=x86_64 \
  && spack load ${COMPILER} \
  && spack compiler find \
diff --git a/libs/Dockerfile b/libs/Dockerfile
index 04702d06..515dce02 100644
--- a/libs/Dockerfile
+++ b/libs/Dockerfile
@@ -4,9 +4,8 @@ FROM ${BASE_IMAGE}
 
 ARG LIBS_VERSION
 ARG SPACK_INSTALL_ARGS
-ARG PARALLELISM=1
 
-ENV SPACK_INSTALL_ARGS=${SPACK_INSTALL_ARGS:-"--show-log-on-error --fail-fast"}
+ENV SPACK_INSTALL_ARGS=${SPACK_INSTALL_ARGS:-"--verbose --test=all --fail-fast"}
 ENV MPI=${MPI}
 
 SHELL ["/usr/local/bin/spack-env", "/bin/bash", "-c"]
@@ -39,9 +38,4 @@ RUN cd /opt/spack-environment \
 
 RUN cd /opt/spack-environment \
  && spack env activate . \
- && ( for N in {2..${PARALLELISM}} \
-    ; do spack install ${SPACK_INSTALL_ARGS} --reuse \
-    & done \
-   && spack install ${SPACK_INSTALL_ARGS} --reuse \
-    ) \
- || tail -n +1 -- /tmp/root/spack-stage/spack-stage-*/spack-*-out.txt
+ && spack install ${SPACK_INSTALL_ARGS} --reuse
diff --git a/mpi/Dockerfile b/mpi/Dockerfile
index 854a15c5..d4efde8e 100644
--- a/mpi/Dockerfile
+++ b/mpi/Dockerfile
@@ -4,15 +4,11 @@ FROM ${BASE_IMAGE}
 
 ARG MPI
 ARG SPACK_INSTALL_ARGS
-ARG PARALLELISM=1
 
-ENV SPACK_INSTALL_ARGS=${SPACK_INSTALL_ARGS:-"--show-log-on-error --fail-fast"}
+ENV SPACK_INSTALL_ARGS=${SPACK_INSTALL_ARGS:-"--verbose --test=all --fail-fast"}
 ENV MPI=${MPI}
 
 SHELL ["/usr/local/bin/spack-env", "/bin/bash", "-c"]
 
 RUN set -ex \
- && for N in {2..${PARALLELISM}} \
-  ; do spack install ${SPACK_INSTALL_ARGS} --reuse "${MPI}%${COMPILER}" "^${CMAKE}" target=x86_64 \
-  & done \
  && spack install ${SPACK_INSTALL_ARGS} --reuse "${MPI}%${COMPILER}" "^${CMAKE}" target=x86_64