Refine cori build scripts

scripts/dashboard/nightly/cori-cray-mpich.cmake

@@ -6,7 +6,7 @@ set(CTEST_BUILD_FLAGS "-k -j10")
 set(CTEST_TEST_ARGS PARALLEL_LEVEL 10)
 
 set(CTEST_BUILD_NAME "Linux-CrayCLE6-KNL_Cray_MPICH")
-set(dashboard_model Experimental)
+set(dashboard_model Nightly)
 set(CTEST_DASHBOARD_ROOT ${CMAKE_CURRENT_BINARY_DIR}/${CTEST_BUILD_NAME})
 
 

scripts/dashboard/nightly/cori-gcc-mpich.cmake

@@ -6,7 +6,7 @@ set(CTEST_BUILD_FLAGS "-k -j10")
 set(CTEST_TEST_ARGS PARALLEL_LEVEL 10)
 
 set(CTEST_BUILD_NAME "Linux-CrayCLE6-KNL_GCC_MPICH")
-set(dashboard_model Experimental)
+set(dashboard_model Nightly)
 set(CTEST_DASHBOARD_ROOT ${CMAKE_CURRENT_BINARY_DIR}/${CTEST_BUILD_NAME})
 
 

scripts/dashboard/nightly/cori-intel-mpich.cmake

@@ -6,7 +6,7 @@ set(CTEST_BUILD_FLAGS "-k -j10")
 set(CTEST_TEST_ARGS PARALLEL_LEVEL 10)
 
 set(CTEST_BUILD_NAME "Linux-CrayCLE6-KNL_Intel_MPICH")
-set(dashboard_model Experimental)
+set(dashboard_model Nightly)
 set(CTEST_DASHBOARD_ROOT ${CMAKE_CURRENT_BINARY_DIR}/${CTEST_BUILD_NAME})
 
 

scripts/dashboard/nightly/cori-mpich-tests.slurm

@@ -2,10 +2,9 @@
 #SBATCH -A m1248
 #SBATCH -p debug
 #SBATCH -N 2
-#SBATCH -t 0:00:30
+#SBATCH -t 0:01:00
 #SBATCH -n 8
 #SBATCH -J adios_nightly
-#SBATCH -L scratch
 #SBATCH -C knl,quad,cache
 
 case ${SLURM_ARRAY_TASK_ID} in
@@ -24,8 +23,8 @@ echo "SLURM_ARRAY_TASK_ID: ${SLURM_ARRAY_TASK_ID}"
 echo "CTEST_COMPILER: ${CTEST_COMPILER}"
 
 CTEST=${HOME}/dashboards/cori/support/CMake/install/v3.9.5/bin/ctest
-SCRIPT_DIR=${PWD}/source/scripts/dashboard/nightly
+SCRIPT_DIR=${PWD}/Source/scripts/dashboard/nightly
 ${CTEST} -VV -S ${SCRIPT_DIR}/cori-${CTEST_COMPILER}-mpich.cmake \
   -Ddashboard_full=OFF \
   -Ddashboard_do_test=ON \
-  -Ddashboard_do_submit=OFF 2>&1 1>>cori-${CTEST_COMPILER}-mpich.log
+  -Ddashboard_do_submit=OFF 2>&1 1>>Logs/cori-${CTEST_COMPILER}-mpich.log

scripts/dashboard/nightly/cori.sh

@@ -20,9 +20,9 @@ then
   git clone https://github.com/ornladios/adios2.git Source
 else
   pushd Source
-#  git fetch --all -p
-#  git checkout -f master
-#  git pull --ff-only
+  git fetch --all -p
+  git checkout -f master
+  git pull --ff-only
   popd
 fi
 SCRIPT_DIR=${PWD}/Source/scripts/dashboard/nightly
@@ -58,9 +58,10 @@ ${CTEST} -VV -S ${SCRIPT_DIR}/cori-cray-mpich.cmake \
 # Now run the MPI tests in a batch job
 log "Submitting Parallel Tests"
 JOBID=$(sbatch --array=1-3 ${SCRIPT_DIR}/cori-mpich-tests.slurm | awk '{print $4}')
+sleep 30
 while true
 do
-  NJOBS=$(sacct -j ${JOBID} | grep "^${JOBID} " | wc -l) 
+  NJOBS=$(sacct -n -P --delimiter ' ' -s CF,CG,PD,R,RS -j ${JOBID} | wc -l)
   log "Test jobs active in queue for job array ${JOBID}: ${NJOBS}"
   if [ ${NJOBS} -eq 0 ]
   then