Adding script to load functions, and possibility to add more wf

chiarazampolli · davidrohr · commit 4b2ed76b453a · 2023-02-07T21:20:08.000+01:00
diff --git a/prodtests/full-system-test/dpl-workflow.sh b/prodtests/full-system-test/dpl-workflow.sh
@@ -3,6 +3,7 @@
 # ---------------------------------------------------------------------------------------------------------------------
 # Get this script's directory and load common settings (use zsh first (e.g. on Mac) and fallback on `readlink -f` if zsh is not there)
 MYDIR="$(dirname $(realpath $0))"
+source $MYDIR/gen_topo_helper_functions.sh
 source $MYDIR/setenv.sh
 
 if [[ $EPNSYNCMODE == 0 && $DPL_CONDITION_BACKEND != "http://o2-ccdb.internal" && $DPL_CONDITION_BACKEND != "http://localhost:8084" && $DPL_CONDITION_BACKEND != "http://127.0.0.1:8084" ]]; then
@@ -492,7 +493,12 @@ if [[ ! -z "$EXTRA_WORKFLOW" ]]; then
 fi
 
 if [[ ! -z "$ADD_EXTRA_WORKFLOW" ]]; then
-  add_W $ADD_EXTRA_WORKFLOW
+  OLD_IFS=$IFS
+  IFS=','
+  for wf in $ADD_EXTRA_WORKFLOW; do
+    [[ ! -z "$wf" ]] && add_W $wf
+  done
+  IFS="$OLD_IFS"
 fi
 
 # ---------------------------------------------------------------------------------------------------------------------
diff --git a/prodtests/full-system-test/gen_topo_helper_functions.sh b/prodtests/full-system-test/gen_topo_helper_functions.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ "0$O2DPG_ROOT" == "0" ]; then
+    echo O2DPG environment not loaded
+    exit 1
+fi
+
+source $O2DPG_ROOT/DATA/common/gen_topo_helper_functions.sh
