diff --git a/MC/bin/tests/wf_test_pp.sh b/MC/bin/tests/wf_test_pp.sh index c5213a20f..4ce7068c7 100644 --- a/MC/bin/tests/wf_test_pp.sh +++ b/MC/bin/tests/wf_test_pp.sh @@ -15,9 +15,9 @@ # ----------- START ACTUAL JOB ----------------------------- -NSIGEVENTS=${NSIGEVENTS:-1} +NSIGEVENTS=${NSIGEVENTS:-5} SIGPROC=${SIGPROC:-cdiff} -NTIMEFRAMES=${NTIMEFRAMES:-1} +NTIMEFRAMES=${NTIMEFRAMES:-2} SIMENGINE=${SIMENGINE:-TGeant3} NWORKERS=${NWORKERS:-1} SEED=${SEED:-624} @@ -26,4 +26,5 @@ INTERACTIONRATE=${INTERACTIONRATE:-50000} # create workflow ${O2DPG_ROOT}/MC/bin/o2dpg_sim_workflow.py -eCM 5020 -col pp -gen pythia8 -proc ${SIGPROC} -ns ${NSIGEVENTS} \ -tf ${NTIMEFRAMES} -e ${SIMENGINE} -j ${NWORKERS} -seed ${SEED} \ - --include-analysis -run 310000 -interactionRate ${INTERACTIONRATE} + --include-analysis -run 310000 -interactionRate ${INTERACTIONRATE} \ + --include-local-qc diff --git a/test/run_workflow_tests.sh b/test/run_workflow_tests.sh index cbf05c418..c4a2daeaa 100755 --- a/test/run_workflow_tests.sh +++ b/test/run_workflow_tests.sh @@ -67,11 +67,16 @@ test_single_wf() echo "Test ${wf_line} from ${wfs}" > ${LOG_FILE_WF} bash ${wf_script_local} >> ${LOG_FILE_WF} 2>&1 local ret_this=${?} + local ret_this_qc=0 + local ret_this_analysis=0 if [[ "${ret_this}" != "0" ]] ; then echo "[FATAL]: O2DPG_TEST Workflow creation failed" >> ${LOG_FILE_WF} elif [[ "${execute}" != "" ]] ; then ${O2DPG_ROOT}/MC/bin/o2_dpg_workflow_runner.py -f workflow.json --cpu-limit 8 -tt aod >> ${LOG_FILE_WF} 2>&1 ret_this=${?} + [[ "${ret_this}" == "0" ]] && { ${O2DPG_ROOT}/MC/bin/o2_dpg_workflow_runner.py -f workflow.json --cpu-limit 8 --target-labels QC >> ${LOG_FILE_WF} 2>&1 ; ret_this_qc=${?} ; } + [[ "${ret_this}" == "0" ]] && { ${O2DPG_ROOT}/MC/bin/o2_dpg_workflow_runner.py -f workflow.json --cpu-limit 8 --target-labels Analysis >> ${LOG_FILE_WF} 2>&1 ; ret_this_analysis=${?} ; } + ret_this=$((ret_this + ret_this_qc + ret_this_analysis)) [[ "${ret_this}" != "0" ]] && echo "[FATAL]: O2DPG_TEST Workflow execution failed" >> ${LOG_FILE_WF} fi return ${ret_this} @@ -183,7 +188,9 @@ source ${REPO_DIR}/test/common/utils/utils.sh pushd ${REPO_DIR} > /dev/null # flag if anything changed in the sim workflow bin dir -changed_wf_bin=$(get_changed_files | grep MC/bin) +changed_wf_bin=$(get_changed_files | grep "MC/bin") +changed_wf_bin_related=$(get_changed_files | grep -E "MC/analysis_testing|MC/config/analysis_testing/json|MC/config/QC/json") + # collect what has changed for PWGs collect_changed_pwg_wf_files @@ -247,7 +254,7 @@ pushd ${TEST_PARENT_DIR_BIN} > /dev/null # global return code for PWGs ret_global_bin=0 -if [[ "${changed_wf_bin}" != "" ]] ; then +if [[ "${changed_wf_bin}" != "" || "${changed_wf_bin_related}" != "" ]] ; then echo "### Test bin-related workflow creation ###" echo # Run all the bin test WF creations