Using function for proxies

Author: chiarazampolli

prodtests/full-system-test/aggregator-workflow.sh

@@ -65,10 +65,20 @@ if [[ $CALIB_PHS_RUNBYRUNCALIB == 1 ]]; then
     EXTRA_WORKFLOW+="o2-phos-calib-workflow --runbyrun | "
 fi
 
-WORKFLOW="o2-dpl-raw-proxy $ARGS_ALL --proxy-name aggregator-proxy --dataspec \"$CALIBDATASPEC\" --channel-config \"name=aggregator-proxy,method=bind,type=pull,rateLogging=1,transport=zeromq,address=tcp://localhost:30453\" | "
+# starting with empty workflow
+WORKFLOW=
+if workflow_has_parameters CALIB_PROXIES; then
+    if [[ ! -z $CALIBDATASPEC_BARREL ]]; then
+  WORKFLOW+="o2-dpl-raw-proxy ${ARGS_ALL} --dataspec \"$CALIBDATASPEC_BARREL\" $(get_proxy_connection barrel input) | "
+    fi
+    if [[ ! -z $CALIBDATASPEC_CALO ]]; then
+  WORKFLOW+="o2-dpl-raw-proxy ${ARGS_ALL} --dataspec \"$CALIBDATASPEC_CALO\" $(get_proxy_connection calo input) | "
+    fi
+fi
+
 WORKFLOW+=$EXTRA_WORKFLOW
 if [[ $CCDBPATH != "none" ]]; then WORKFLOW+="o2-calibration-ccdb-populator-workflow --ccdb-path $CCDBPATH | "; fi
-WORKFLOW+="o2-dpl-run $ARGS_ALL $GLOBALDPLOPT"
+WORKFLOW+="o2-dpl-run $ARGS_ALL $GLOBALDPLOPT -b"
 
 if [ $WORKFLOWMODE == "print" ]; then
   echo Workflow command:

prodtests/full-system-test/calib-workflow.sh

@@ -15,8 +15,13 @@ fi
 if [[ $CALIB_TPC_SCDCALIB == 1 ]]; then add_W o2-tpc-scdcalib-interpolation-workflow "$DISABLE_ROOT_OUTPUT --disable-root-input --pipeline $(get_N tpc-track-interpolation TPC REST)" "$ITSMFT_FILES"; fi
 
 # output-proxy for aggregator
-if [[ ! -z $CALIBDATASPEC ]]; then
-    WORKFLOW+="o2-dpl-output-proxy ${ARGS_ALL} --dataspec \"$CALIBDATASPEC\" --proxy-channel-name aggregator-proxy --channel-config \"name=aggregator-proxy,method=connect,type=push,transport=zeromq,rateLogging=1,address=tcp://localhost:30453\" | "
+if workflow_has_parameters CALIB_PROXIES; then
+    if [[ ! -z $CALIBDATASPEC_BARREL ]]; then
+  WORKFLOW+="o2-dpl-output-proxy ${ARGS_ALL} --dataspec \"$CALIBDATASPEC_BARREL\" $(get_proxy_connection barrel output) | "
+    fi
+    if [[ ! -z $CALIBDATASPEC_CALO ]]; then
+  WORKFLOW+="o2-dpl-output-proxy ${ARGS_ALL} --dataspec \"$CALIBDATASPEC_CALO\" $(get_proxy_connection calo output) | "
+    fi
 fi
 
 true # everything OK up to this point, so the script should return 0 (it is !=0 already if a has_detector check fails)

prodtests/full-system-test/dpl-workflow.sh

@@ -386,10 +386,7 @@ fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Calibration workflows
-if [[ -z $CALIB_WF ]]; then
-    CALIB_WF=$MYDIR/calib-workflow.sh
-fi
-workflow_has_parameter CALIB && { source $CALIB_WF; [[ $? != 0 ]] && exit 1; }
+workflow_has_parameter CALIB && { source ${CALIB_WF:-$MYDIR/calib-workflow.sh}; [[ $? != 0 ]] && exit 1; }
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Event display