Fix parallel testing

[alexxy/gromacs.git] / admin / gitlab-ci / gromacs.gitlab-ci.yml

diff --git a/admin/gitlab-ci/gromacs.gitlab-ci.yml b/admin/gitlab-ci/gromacs.gitlab-ci.yml
index 1285c582c694c1a38a50a3989d856b4cf9bd347e..4f8e644cb91c5dc3bc3b149819908d85ce819866 100644 (file)
--- a/admin/gitlab-ci/gromacs.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.gitlab-ci.yml
@@ -261,15 +261,16 @@ gromacs:clang-8:configure:
 
 gromacs:clang-3.6:configure:
   extends:
-   - .gromacs:base:configure
-   - .use-clang:base
-   - .rules:merge-requests
+    - .gromacs:base:configure
+    - .use-clang:base
+    - .use-mpi
+    - .rules:merge-requests
   image: gromacs/cmake-3.9.6-llvm-3.6-amdopencl-openmpi:2020
   variables:
     COMPILER_MAJOR_VERSION: "3.6"
     CMAKE_PRECISION_OPTIONS: "-DGMX_DOUBLE=ON"
-    CMAKE_MPI_OPTIONS: "-DGMX_OPENMP=OFF"
     CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=SSE4.1"
+    CMAKE_EXTRA_OPTIONS: "-DGMX_OPENMP=OFF"
 
 gromacs:clang-static-analyzer:configure:
   extends:
@@ -329,15 +330,16 @@ gromacs:clang-3.6:release:configure:
   extends:
     - .gromacs:base:release:configure
     - .use-clang:base
+    - .use-mpi
     - .rules:nightly-only-for-release
   image: gromacs/cmake-3.9.6-llvm-3.6-amdopencl-openmpi:2020
   variables:
     COMPILER_MAJOR_VERSION: "3.6"
     RELEASE_BUILD_DIR: release-builds-clang
     CMAKE_PRECISION_OPTIONS: "-DGMX_DOUBLE=ON"
-    CMAKE_MPI_OPTIONS: "-DGMX_OPENMP=OFF"
     CMAKE_SIMD_OPTIONS: "-DGMX_SIMD=SSE4.1"
     CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=RelWithAssert"
+    CMAKE_EXTRA_OPTIONS: "-DGMX_OPENMP=OFF"
   dependencies:
     - archive:package
     - regressiontests:package
@@ -543,11 +545,7 @@ gromacs:clang-8:release:build:
     - ctest -D $CTEST_RUN_MODE --output-on-failure | tee ctestLog.log || true
     - awk '/The following tests FAILED/,/^Errors while running CTest|^$/'
       ctestLog.log | tee ctestErrors.log
-    - if [ $CTEST_RUN_MODE == "ExperimentalTest" ] ; then
-      xsltproc scripts/CTest2JUnit.xsl Testing/`head -n 1 < Testing/TAG`/Test.xml > JUnitTestResults.xml;
-      else
-      touch JUnitTestResults.xml;
-      fi
+    - xsltproc scripts/CTest2JUnit.xsl Testing/`head -n 1 < Testing/TAG`/*.xml > JUnitTestResults.xml
     - if [ -s ctestErrors.log ] ; then
       echo "Error during running ctest";
       exit 1;
@@ -587,8 +585,8 @@ gromacs:clang-8:release:build:
     - cd regressiontests
     - perl gmxtest.pl $REGRESSIONTEST_PARALLEL $REGRESSIONTEST_TOTAL_RANK_NUMBER -ntomp $REGRESSIONTEST_OMP_RANK_NUMBER -npme $REGRESSIONTEST_PME_RANK_NUMBER $REGRESSIONTEST_DOUBLE $REGRESSIONTEST_MPI_RUN_COMMAND -xml all
   artifacts:
-    reports:
-      junit: regressiontests/gmxtest.xml
+    paths:
+      - regressiontests/gmxtest.xml
     when: always
     expire_in: 1 week
 
@@ -715,6 +713,7 @@ gromacs:clang-3.6:regressiontest:
   variables:
     REGRESSIONTEST_DOUBLE: "-double"
     REGRESSIONTEST_OMP_RANK_NUMBER: 0
+    REGRESSIONTEST_PARALLEL: "-np"
   needs:
     - job: gromacs:clang-3.6:build
     - job: regressiontests:prepare
@@ -789,6 +788,7 @@ gromacs:clang-3.6:release:regressiontest:
     BUILD_DIR: release-builds-clang
     REGRESSIONTEST_DOUBLE: "-double"
     REGRESSIONTEST_OMP_RANK_NUMBER: 0
+    REGRESSIONTEST_PARALLEL: "-np"
   needs:
     - job: gromacs:clang-3.6:release:build
     - job: regressiontests:package