Better pattern matching in CI script

2a00a96f · Andreas Marek · be19d791 · 2a00a96f · 2a00a96f
Commit 2a00a96f authored Mar 20, 2019 by Andreas Marek
Hide whitespace changes
Inline Side-by-side

Showing with 59 additions and 56 deletions

.gitlab-ci.yml .gitlab-ci.yml +8 -8

ci_test_scripts/run_ci_tests.sh ci_test_scripts/run_ci_tests.sh +51 -48

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -148,14 +148,14 @@ python-intel-intel-mpi-openmp:
   - ./ci_test_scripts/run_ci_tests.sh -c "CC=\"mpiicc\" CFLAGS=\"-O3 -xAVX\" FC=\"mpiifort\" FCFLAGS=\"-O3 -xAVX\" SCALAPACK_LDFLAGS=\"$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP \" SCALAPACK_FCFLAGS=\"$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP \" --enable-option-checking=fatal --with-mpi=yes --enable-openmp --disable-gpu --enable-avx --enable-python --enable-python-tests" -j 8 -t 2 -m $MATRIX_SIZE -n $NUMBER_OF_EIGENVECTORS -b $BLOCK_SIZE -s $SKIP_STEP -i $INTERACTIVE_RUN -S $SLURM


-python-distcheck:
-  tags:
-    - python
-  script:
-    - ./configure CC="mpiicc" CFLAGS="-O3 -xAVX" FC="mpiifort" FCFLAGS="-O3 -xAVX" SCALAPACK_LDFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP" SCALAPACK_FCFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP" --enable-option-checking=fatal --with-mpi=yes --enable-openmp --disable-gpu --enable-avx --enable-python --enable-python-tests || { cat config.log; exit 1; }
-    # stupid 'make distcheck' leaves behind write-protected files that the stupid gitlab runner cannot remove
-    - make distcheck DISTCHECK_CONFIGURE_FLAGS="CC=\"mpiicc\" CFLAGS=\"-O3 -xAVX\" FC=\"mpiifort\" FCFLAGS=\"-O3 -xAVX\" SCALAPACK_LDFLAGS=\"$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP \" SCALAPACK_FCFLAGS=\"$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP \" --enable-option-checking=fatal --with-mpi=yes --enable-openmp --disable-gpu --enable-avx --enable-python --enable-python-tests" TASKS=2 TEST_FLAGS="150 50 16" || { chmod u+rwX -R . ; exit 1 ; }
-
+     #python-distcheck:
+     #  tags:
+     #    - python
+     #  script:
+     #    - ./configure CC="mpiicc" CFLAGS="-O3 -xAVX" FC="mpiifort" FCFLAGS="-O3 -xAVX" SCALAPACK_LDFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP" SCALAPACK_FCFLAGS="$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP" --enable-option-checking=fatal --with-mpi=yes --enable-openmp --disable-gpu --enable-avx --enable-python --enable-python-tests || { cat config.log; exit 1; }
+     #    # stupid 'make distcheck' leaves behind write-protected files that the stupid gitlab runner cannot remove
+     #    - make distcheck DISTCHECK_CONFIGURE_FLAGS="CC=\"mpiicc\" CFLAGS=\"-O3 -xAVX\" FC=\"mpiifort\" FCFLAGS=\"-O3 -xAVX\" SCALAPACK_LDFLAGS=\"$MKL_ANACONDA_INTEL_SCALAPACK_LDFLAGS_MPI_OMP \" SCALAPACK_FCFLAGS=\"$MKL_ANACONDA_INTEL_SCALAPACK_FCFLAGS_MPI_OMP \" --enable-option-checking=fatal --with-mpi=yes --enable-openmp --disable-gpu --enable-avx --enable-python --enable-python-tests" TASKS=2 TEST_FLAGS="150 50 16" || { chmod u+rwX -R . ; exit 1 ; }
+     #

 # test_project_1stage_legacy_api_gnu
 test_project_1stage_legacy_api_gnu:

--- a/ci_test_scripts/run_ci_tests.sh
+++ b/ci_test_scripts/run_ci_tests.sh
@@ -104,6 +104,9 @@ then
 fi
 if [ "$slurmBatch" == "yes" ]
 then
+
+  # default exit code
+  exitCode=1
  CLUSTER=""
  if [[ "$HOST" =~ "cobra" ]]
  then
@@ -122,65 +125,65 @@ then
    CLUSTER="draco"
  fi

+  echo "Running on $CLUSTER with runner $CI_RUNNER_DESCRIPTION with tag $CI_RUNNER_TAGS"

-  if [ "$CLUSTER" == "cobra" ]
+  # GPU runners
+  if [ "$CI_RUNNER_TAGS" == "gpu" ]
  then
-    echo "Running on cobra with runner $CI_RUNNER_DESCRIPTION with tag $CI_RUNNER_TAGS"
-
-    # GPU runners
-    if [ "$CI_RUNNER_TAGS" == "gpu" ]
-    then
-      cp $HOME/runners/job_script_templates/run_${CLUSTER}_1node_2GPU.sh .
-      echo "./configure " "$configureArgs" >> ./run_${CLUSTER}_1node_2GPU.sh
-      echo " " >> ./run_${CLUSTER}_1node_2GPU.sh
-      echo "make -j 16" >> ./run_${CLUSTER}_1node_2GPU.sh
-      echo " " >> ./run_${CLUSTER}_1node_2GPU.sh
-      echo "export OMP_NUM_THREADS=$ompThreads" >> ./run_${CLUSTER}_1node_2GPU.sh
-      echo "export TASKS=$mpiTasks" >> ./run_${CLUSTER}_1node_2GPU.sh
-      echo "make check TEST_FLAGS=\" $matrixSize $nrEV $blockSize \" " >> ./run_${CLUSTER}_1node_2GPU.sh
-
-      sbatch -W ./run_${CLUSTER}_1node_2GPU.sh
-
-      exitCode=$?
-      cat ./ELPA_CI_2gpu.out.*
-      if (( $exitCode > 0 ))
-      then
-        cat ./ELPA_CI_2gpu.err.*
-      fi
-      
-    fi
-
-    #SSE, AVX, AVX2, and AVX-512 runners
-    if [ "$CI_RUNNER_TAGS" == "sse" ] || [ "$CI_RUNNER_TAGS" == "avx" ] || [ "$CI_RUNNER_TAGS" == "avx2" ]  || [ "$CI_RUNNER_TAGS" == "avx512" ]
+    cp $HOME/runners/job_script_templates/run_${CLUSTER}_1node_2GPU.sh .
+    echo "./configure " "$configureArgs" >> ./run_${CLUSTER}_1node_2GPU.sh
+    echo " " >> ./run_${CLUSTER}_1node_2GPU.sh
+    echo "make -j 16" >> ./run_${CLUSTER}_1node_2GPU.sh
+    echo " " >> ./run_${CLUSTER}_1node_2GPU.sh
+    echo "export OMP_NUM_THREADS=$ompThreads" >> ./run_${CLUSTER}_1node_2GPU.sh
+    echo "export TASKS=$mpiTasks" >> ./run_${CLUSTER}_1node_2GPU.sh
+    echo "make check TEST_FLAGS=\" $matrixSize $nrEV $blockSize \" " >> ./run_${CLUSTER}_1node_2GPU.sh
+
+    sbatch -W ./run_${CLUSTER}_1node_2GPU.sh
+
+    exitCode=$?
+    echo " "
+    echo "Exit Code of sbatch: $exitCode"
+    echo " "
+    if (( $exitCode > 0 ))
    then
-      cp $HOME/runners/job_script_templates/run_${CLUSTER}_1node.sh .
-      echo "./configure " "$configureArgs" >> ./run_${CLUSTER}_1node.sh
-      echo " " >> ./run_${CLUSTER}_1node.sh
-      echo "make -j 16" >> ./run_${CLUSTER}_1node.sh
-      echo " " >> ./run_${CLUSTER}_1node.sh
-      echo "export OMP_NUM_THREADS=$ompThreads" >> ./run_${CLUSTER}_1node.sh
-      echo "export TASKS=$mpiTasks" >> ./run_${CLUSTER}_1node.sh
-      echo "make check TEST_FLAGS=\" $matrixSize $nrEV $blockSize \" " >> ./run_${CLUSTER}_1node.sh
-
-      sbatch -W ./run_${CLUSTER}_1node.sh
-
-      exitCode=$?
-      cat ./ELPA_CI.out.*
-      if (( $exitCode > 0 ))
-      then
-        cat ./ELPA_CI.err.*
-      fi
-
+      cat ./ELPA_CI_2gpu.err.*
    fi
+    
+  fi

+  #SSE, AVX, AVX2, and AVX-512 runners
+  if [[ "$CI_RUNNER_TAGS" =~ "sse" ]] || [[ "$CI_RUNNER_TAGS" =~ "avx" ]] || [[ "$CI_RUNNER_TAGS" =~ "avx2" ]]  || [ ["$CI_RUNNER_TAGS" =~ "avx512" ]]
+  then
+    cp $HOME/runners/job_script_templates/run_${CLUSTER}_1node.sh .
+    echo "./configure " "$configureArgs" >> ./run_${CLUSTER}_1node.sh
+    echo " " >> ./run_${CLUSTER}_1node.sh
+    echo "make -j 16" >> ./run_${CLUSTER}_1node.sh
+    echo " " >> ./run_${CLUSTER}_1node.sh
+    echo "export OMP_NUM_THREADS=$ompThreads" >> ./run_${CLUSTER}_1node.sh
+    echo "export TASKS=$mpiTasks" >> ./run_${CLUSTER}_1node.sh
+    echo "make check TEST_FLAGS=\" $matrixSize $nrEV $blockSize \" " >> ./run_${CLUSTER}_1node.sh
+
+    cat ./run_${CLUSTER}_1node.sh
+    sbatch -W ./run_${CLUSTER}_1node.sh
+    exitCode=$?
+    echo " "
+    echo "Exit Code of sbatch: $exitCode"
+    echo " "
+    cat ./ELPA_CI.out.*
    if (( $exitCode > 0 ))
    then
-      cat ./test-suite.log
+      cat ./ELPA_CI.err.*
    fi

-    exit $exitCode
  fi

+  if (( $exitCode > 0 ))
+  then
+    cat ./test-suite.log
+  fi
+
+  exit $exitCode

 fi