Skip to content

Commit 0ebf454

Browse files
Robin VAN DE MERGHELRobin-Van-de-Merghel
authored andcommitted
fix: Moved up futureServices argument to prevent "Missing mandatory /DiracX/URL configuration"
1 parent d98b705 commit 0ebf454

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

tests/Jenkins/dirac_ci.sh

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,16 +164,19 @@ installSite() {
164164
diracxSetupArgs=("--credentials-dir" "$SERVERINSTALLDIR/etc/grid-security")
165165
if [[ "${TEST_DIRACX:-}" = "Yes" ]]; then
166166
diracxSetupArgs+=("--url=${DIRACX_URL}")
167-
else
168-
diracxSetupArgs+=("--disable-vo" "vo")
169-
fi
170167

171-
# Call findFutureServices and read services into an array
172-
mapfile -t futureServices < <(python -m DIRAC.Core.Utilities.Extensions findFutureServices | sed 's/System / /g' | sed 's/Handler//g' | sed 's/Client//g' | sed 's/ /\//g')
168+
# Only if we have TEST_DIRACX we can have a legacy_adapted service, or it will crash
169+
# "Missing mandatory /DiracX/URL configuration"
170+
# Call findFutureServices and read services into an array
171+
mapfile -t futureServices < <(python -m DIRAC.Core.Utilities.Extensions findFutureServices | sed 's/System / /g' | sed 's/Handler//g' | sed 's/Client//g' | sed 's/ /\//g')
173172

174-
# If there are any services, add them to the args
175-
if [[ ${#futureServices[@]} -gt 0 ]]; then
176-
diracxSetupArgs+=(--legacy-adapted-services "${futureServices[@]}")
173+
# If there are any services, add them to the args
174+
if [[ ${#futureServices[@]} -gt 0 ]]; then
175+
diracxSetupArgs+=(--legacy-adapted-services "${futureServices[@]}")
176+
fi
177+
178+
else
179+
diracxSetupArgs+=("--disable-vo" "vo")
177180
fi
178181

179182
if ! python "${TESTCODE}/DIRAC/tests/Jenkins/dirac-cfg-setup-diracx.py" "${diracxSetupArgs[@]}"; then

0 commit comments

Comments
 (0)