Docker: Remove early adoption of do_regtest.py

cp2k · Oct 27, 2021 · 545439e · 545439e
1 parent 29435e6
commit 545439e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/tools/docker/Dockerfile.test_cuda-psmp b/tools/docker/Dockerfile.test_cuda-psmp
@@ -11,7 +11,7 @@ RUN ./install_basics.sh
 COPY ./scripts/install_regtest.sh .
 RUN ./install_regtest.sh local_cuda psmp
 
-ENV USE_DO_REGTEST_PY=1
+ENV TESTOPTS="--keepalive"
 COPY ./scripts/ci_entrypoint.sh ./scripts/test_regtest.sh ./
 CMD ["./ci_entrypoint.sh", "./test_regtest.sh", "local_cuda", "psmp"]
 

diff --git a/tools/docker/Dockerfile.test_hip-psmp b/tools/docker/Dockerfile.test_hip-psmp
@@ -11,7 +11,7 @@ RUN ./install_basics.sh
 COPY ./scripts/install_regtest.sh .
 RUN ./install_regtest.sh local_hip psmp
 
-ENV USE_DO_REGTEST_PY=1
+ENV TESTOPTS="--keepalive"
 COPY ./scripts/ci_entrypoint.sh ./scripts/test_regtest.sh ./
 CMD ["./ci_entrypoint.sh", "./test_regtest.sh", "local_hip", "psmp"]
 

diff --git a/tools/docker/scripts/test_regtest.sh b/tools/docker/scripts/test_regtest.sh
@@ -58,12 +58,7 @@ export COSMA_DIM_THRESHOLD=0
 
 # Run regtests.
 echo -e "\n========== Running Regtests =========="
-if [ -n "${USE_DO_REGTEST_PY}" ]; then
-  ./tools/regtesting/print_environment.sh "${ARCH}" "${VERSION}"
-  ./tools/regtesting/do_regtest.py "${ARCH}" "${VERSION}"
-else
-  make ARCH="${ARCH}" VERSION="${VERSION}" TESTOPTS="${TESTOPTS}" test
-fi
+make ARCH="${ARCH}" VERSION="${VERSION}" TESTOPTS="${TESTOPTS}" test
 
 exit 0 # Prevent CI from overwriting do_regtest's summary message.