Skip to content

Commit

Permalink
Catch files that are WF related
Browse files Browse the repository at this point in the history
  • Loading branch information
Benedikt Volkel authored and sawenzel committed Dec 15, 2023
1 parent eab1756 commit 61e60a4
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions test/run_workflow_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ test_single_wf()
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_thi + ret_this_qc + 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 @@ -188,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 @@ -252,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

0 comments on commit 61e60a4

Please sign in to comment.