Skip to content

Commit ee97f5a

Browse files
committed
Do not check for token for local CCDB backends
1 parent 40bc7fc commit ee97f5a

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ export GEN_TOPO_AUTOSCALE_PROCESSES_GLOBAL_WORKFLOW=1
1212
source $GEN_TOPO_MYDIR/gen_topo_helper_functions.sh || { echo "gen_topo_helper_functions.sh failed" 1>&2 && exit 1; }
1313
source $GEN_TOPO_MYDIR/setenv.sh || { echo "setenv.sh failed" 1>&2 && exit 1; }
1414

15-
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
15+
# A local CCDB backend needs no grid token.
16+
if [[ $EPNSYNCMODE == 0 && ${DPL_CONDITION_BACKEND:-} != http://o2-ccdb.internal* && ${DPL_CONDITION_BACKEND:-} != http://localhost:* && ${DPL_CONDITION_BACKEND:-} != http://127.0.0.1:* ]]; then
1617
alien-token-info >& /dev/null
1718
if [[ $? != 0 ]]; then
1819
echo "FATAL: No alien token present" 1>&2

prodtests/full_system_test.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ if [ "0$O2_ROOT" == "0" ] || [ "0$AEGIS_ROOT" == "0" ]; then
1717
exit 1
1818
fi
1919

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

0 commit comments

Comments
 (0)