Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WF CI] Test also QC and AnalysisQC #1384

Merged
merged 2 commits into from
Dec 15, 2023
Merged

[WF CI] Test also QC and AnalysisQC #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac0e887
[WF CI] Test also QC and AnalysisQC
Dec 13, 2023
fbb75d0
Catch files that are WF related
Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions MC/bin/tests/wf_test_pp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
11 changes: 9 additions & 2 deletions test/run_workflow_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down