diff --git a/scripts/find_slurm_ctest_stop_time.sh b/scripts/find_slurm_ctest_stop_time.sh index c450f17a1aa68f247bbb7a279b57616a9df84ef3..2f1e7bb17ec0ccf2d4885733b525bcd180a9b815 100755 --- a/scripts/find_slurm_ctest_stop_time.sh +++ b/scripts/find_slurm_ctest_stop_time.sh @@ -20,7 +20,8 @@ # SLURM end time END_TIME=`squeue -j ${SLURM_JOB_ID} -h --Format EndTime` -echo "SLURM Job end time ${END_TIME}" +CET_CEST=`date +"%Z"` +echo "SLURM Job end time ${END_TIME} probably ${CET_CEST}" # Ctest end time = SLURM -5 minutes (should be enough for coverage and uploads) # => Not working as ctest expects the "time point in hours-minutes-seconds within current day" @@ -36,7 +37,8 @@ echo "SLURM Job end time ${END_TIME}" # (tried all timezone options of date, with and without space between time and timezone) #CTEST_END_TIME_LIMIT=`date -d "${END_TIME}CET -5minutes" +"%H:%M:%S %z"` # => Working! but probably unsafe on day of Summer time swaps + if tests run close to midnight... -CTEST_END_TIME_LIMIT=`date -d "${END_TIME}CET -5minutes" +"%H:%M:%S"` +# => Fixed for summer time but will probably still fail on the day of the swap itself... so twice a year +CTEST_END_TIME_LIMIT=`date -d "${END_TIME}${CET_CEST} -5minutes" +"%H:%M:%S"` echo "Setting the job time limit for ctest to ${CTEST_END_TIME_LIMIT} to make sure CDASH data is uploaded" if [[ $# -eq 1 ]]; then