Add JOBUTILS_JOB_SKIPCREATEDONE option, and do not wipe ctf_dictionary in full system test if recreation task is not running

davidrohr · sawenzel · commit 8c69ec80e36c · 2021-01-26T12:49:33.000+01:00
diff --git a/Utilities/Tools/jobutils.sh b/Utilities/Tools/jobutils.sh
@@ -348,10 +348,12 @@ taskwrapper() {
   RC=$?
   RC_ACUM=$((RC_ACUM+RC))
   if [ "${RC}" -eq "0" ]; then
-    # if return code 0 we mark this task as done
-    echo "Command \"${command}\" successfully finished." > "${logfile}"_done
-    echo "The presence of this file can be used to skip this command in future runs" >> "${logfile}"_done
-    echo "of the pipeline by setting the JOBUTILS_SKIPDONE environment variable." >> "${logfile}"_done
+    if [ ! "${JOBUTILS_JOB_SKIPCREATEDONE}" ]; then
+      # if return code 0 we mark this task as done
+      echo "Command \"${command}\" successfully finished." > "${logfile}"_done
+      echo "The presence of this file can be used to skip this command in future runs" >> "${logfile}"_done
+      echo "of the pipeline by setting the JOBUTILS_SKIPDONE environment variable." >> "${logfile}"_done
+    fi
   else
     echo "command ${command} had nonzero exit code ${RC}"
   fi
diff --git a/prodtests/full_system_test.sh b/prodtests/full_system_test.sh
@@ -78,6 +78,7 @@ if [ $ENABLE_GPU_TEST != "0" ]; then
 fi
 STAGES+=" ASYNC"
 for STAGE in $STAGES; do
+  logfile=reco_${STAGE}.log
 
   ARGS_ALL="--session default"
   DICTCREATION=""
@@ -90,7 +91,7 @@ for STAGE in $STAGES; do
     export CTFINPUT=0
     export SAVECTF=0
   elif [[ "$STAGE" = "ASYNC" ]]; then
-    export CREATECTFDICT=1
+    export CREATECTFDICT=0
     export GPUTYPE=CPU
     export SYNCMODE=0
     export HOSTMEMSIZE=$TPCTRACKERSCRATCHMEMORY
@@ -103,14 +104,14 @@ for STAGE in $STAGES; do
     export HOSTMEMSIZE=$TPCTRACKERSCRATCHMEMORY
     export CTFINPUT=0
     export SAVECTF=1
-    rm -f ctf_dictionary.root
+    JOBUTILS_JOB_SKIPCREATEDONE=1 taskwrapper ${logfile} "rm -f ctf_dictionary.root"
+    unset JOBUTILS_JOB_SKIPCREATEDONE
   fi
   export SHMSIZE
   export NTIMEFRAMES
   export TFDELAY
   export GLOBALDPLOPT
 
-  logfile=reco_${STAGE}.log
   taskwrapper ${logfile} "$O2_ROOT/prodtests/full-system-test/dpl-workflow.sh"
 
   # --- record interesting metrics to monitor ----
