Docker: Restore Fedora test which got lost in 7b909a0

tools/docker/Dockerfile.test_fedora-psmp

@@ -22,7 +22,6 @@ COPY ./tools/toolchain/scripts/VERSION \
 COPY ./tools/toolchain/install_cp2k_toolchain.sh .
 RUN ./install_cp2k_toolchain.sh \
     --install-all \
-    --mpi-mode=mpich \
     --with-gcc=system \
     --dry-run
 
@@ -71,20 +70,23 @@ RUN /bin/bash -c " \
     ln -vs /opt/cp2k-toolchain/install/arch/local.psmp ./arch/ && \
     echo 'Compiling cp2k...' && \
     source /opt/cp2k-toolchain/install/setup && \
-    ( make -j ARCH=local VERSION=psmp &> /dev/null || true )"
+    ( make -j ARCH=local VERSION=psmp &> /dev/null || true ) && \
+    rm -rf lib obj && \
+    ( [ ! -f ./exe/local/cp2k.psmp ] || ldd ./exe/local/cp2k.psmp | grep -q libmpi )"
 COPY ./data ./data
 COPY ./tests ./tests
 COPY ./tools/regtesting ./tools/regtesting
 
 # Run regression tests.
-ARG TESTOPTS
+ARG TESTOPTS=""
 COPY ./tools/docker/scripts/test_regtest.sh ./
-RUN /bin/bash -c " \
+RUN /bin/bash -o pipefail -c " \
     TESTOPTS="${TESTOPTS}" \
     ./test_regtest.sh 'local' 'psmp' |& tee report.log && \
     rm -rf regtesting"
 
 # Output the report if the image is old and was therefore pulled from the build cache.
 CMD cat $(find ./report.log -mmin +10) | sed '/^Summary:/ s/$/ (cached)/'
+ENTRYPOINT []
 
 #EOF

tools/docker/generate_dockerfiles.py

@@ -32,6 +32,9 @@ def main() -> None:
         f.write(toolchain_full(mpi_mode="openmpi", with_gcc="install"))
         f.write(regtest("psmp"))
 
+    with OutputFile(f"Dockerfile.test_fedora-psmp", args.check) as f:
+        f.write(toolchain_full(base_image="fedora:33") + regtest("psmp"))
+
     with OutputFile(f"Dockerfile.test_intel-psmp", args.check) as f:
         f.write(toolchain_intel() + regtest("psmp", intel=True))