Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion prodtests/full-system-test/dpl-workflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ export GEN_TOPO_AUTOSCALE_PROCESSES_GLOBAL_WORKFLOW=1
source $GEN_TOPO_MYDIR/gen_topo_helper_functions.sh || { echo "gen_topo_helper_functions.sh failed" 1>&2 && exit 1; }
source $GEN_TOPO_MYDIR/setenv.sh || { echo "setenv.sh failed" 1>&2 && exit 1; }

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
# A local CCDB backend needs no grid token.
if [[ $EPNSYNCMODE == 0 && ${DPL_CONDITION_BACKEND:-} != http://o2-ccdb.internal* && ${DPL_CONDITION_BACKEND:-} != http://localhost:* && ${DPL_CONDITION_BACKEND:-} != http://127.0.0.1:* ]]; then
alien-token-info >& /dev/null
if [[ $? != 0 ]]; then
echo "FATAL: No alien token present" 1>&2
Expand Down
3 changes: 2 additions & 1 deletion prodtests/full_system_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ if [ "0$O2_ROOT" == "0" ] || [ "0$AEGIS_ROOT" == "0" ]; then
exit 1
fi

if [[ $DPL_CONDITION_BACKEND != "http://o2-ccdb.internal" && $DPL_CONDITION_BACKEND != "http://localhost:8084" && $DPL_CONDITION_BACKEND != "http://127.0.0.1:8084" ]]; then
# A local CCDB backend does not need to check for tokens
if [[ $DPL_CONDITION_BACKEND != http://o2-ccdb.internal* && $DPL_CONDITION_BACKEND != http://localhost:* && $DPL_CONDITION_BACKEND != http://127.0.0.1:* ]]; then
alien-token-info >& /dev/null
RETVAL=$?
if [[ $RETVAL != 0 ]]; then
Expand Down