test: Use dedicated script to set up DiracX in the CS

Author: chrisburr

tests/Jenkins/dirac-cfg-setup-diracx.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+import argparse
+import os
+
+import DIRAC
+from DIRAC.Core.Utilities.ReturnValues import returnValueOrRaise
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(description="Setup DIRAC CS for running integration tests with DiracX")
+    parser.add_argument("--disable-vo", nargs="+", help="Disable a VO", default=[])
+    parser.add_argument("--url", help="URL of the DiracX services")
+    parser.add_argument("--credentials-dir", help="Directory where hostcert.pem/hostkey.pem can be found")
+    args = parser.parse_args()
+
+    DIRAC.initialize(
+        host_credentials=(
+            f"{args.credentials_dir}/hostcert.pem",
+            f"{args.credentials_dir}/hostkey.pem",
+        )
+    )
+
+    main(args.url, args.disable_vo)
+
+
+def main(url: str, disabled_vos: list[str]):
+    from DIRAC.ConfigurationSystem.Client.CSAPI import CSAPI
+
+    csAPI = CSAPI()
+
+    returnValueOrRaise(csAPI.createSection("DiracX"))
+
+    if url:
+        returnValueOrRaise(csAPI.setOption("DiracX/URL", url))
+
+    if disabled_vos:
+        returnValueOrRaise(csAPI.setOption("DiracX/DisabledVOs", ",".join(disabled_vos)))
+
+    returnValueOrRaise(csAPI.commit())
+
+
+if __name__ == "__main__":
+    parse_args()

tests/Jenkins/dirac_ci.sh

@@ -136,9 +136,8 @@ installSite() {
   echo "==> Done installing, now configuring"
   source "${SERVERINSTALLDIR}/bashrc"
   configureArgs=()
-  if [[ -n "${TEST_DIRACX:-}" ]]; then
+  if [[ "${TEST_DIRACX:-}" = "Yes" ]]; then
     configureArgs+=("--LegacyExchangeApiKey=diracx:legacy:InsecureChangeMe")
-    configureArgs+=("--DiracxUrl=${DIRACX_URL}")
   fi
   if ! dirac-configure --cfg "${SERVERINSTALLDIR}/install.cfg" "${configureArgs[@]}" "${DEBUG}"; then
     echo "ERROR: dirac-configure failed" >&2
@@ -150,6 +149,18 @@ installSite() {
     exit 1
   fi
 
+  echo "==> Setting up DiracX"
+  diracxSetupArgs=("--credentials-dir" "$SERVERINSTALLDIR/etc/grid-security")
+  if [[ "${TEST_DIRACX:-}" = "Yes" ]]; then
+    diracxSetupArgs+=("--url=${DIRACX_URL}")
+  else
+    diracxSetupArgs+=("--disable-vo" "vo")
+  fi
+  if ! python "${TESTCODE}/DIRAC/tests/Jenkins/dirac-cfg-setup-diracx.py" "${diracxSetupArgs[@]}"; then
+    echo "ERROR: dirac-cfg-setup-diracx.py failed" >&2
+    exit 1
+  fi
+
   echo "==> Completed installation"
 
 }

tests/Jenkins/utilities.sh

@@ -614,7 +614,7 @@ diracProxies() {
   # And make sure it was synced
   if [[ -n $TEST_DIRACX ]]; then
     echo "Waiting for for DiracX to be available" >&2
-    for i in {1..100}; do
+    for i in {1..10}; do
       if dirac-login -C "${SERVERINSTALLDIR}/user/client.pem" -K "${SERVERINSTALLDIR}/user/client.key" -T 72 "${DEBUG}"; then
         break
       fi