refactor: Moved down diracx installation to fix auth

Author: Robin VAN DE MERGHEL

src/DIRAC/Core/Tornado/Client/ClientSelector.py

@@ -16,7 +16,7 @@
 from DIRAC.Core.DISET.RPCClient import RPCClient
 from DIRAC.Core.DISET.TransferClient import TransferClient
 from DIRAC.Core.Tornado.Client.TornadoClient import TornadoClient
-
+import traceback
 
 sLog = gLogger.getSubLogger(__name__)
 
@@ -81,15 +81,13 @@ def ClientSelector(disetClient, *args, **kwargs):  # We use same interface as RP
 
         if completeUrl.startswith("http"):
             sLog.debug(f"Using HTTPS for service {serviceName}")
-            rpc = tornadoClient(*args, **kwargs)
-        else:
-            rpc = disetClient(*args, **kwargs)
+            return tornadoClient(*args, **kwargs)
     except Exception as e:  # pylint: disable=broad-except
         # If anything went wrong in the resolution, we return default RPCClient
         # So the behaviour is exactly the same as before implementation of Tornado
         sLog.warn("Could not select DISET or Tornado client", f"{repr(e)}")
-        rpc = disetClient(*args, **kwargs)
-    return rpc
+        print(traceback.format_exc())
+    return disetClient(*args, **kwargs)
 
 
 # Client to use for RPC selection

src/DIRAC/WorkloadManagementSystem/Client/JobMonitoringClient.py

@@ -18,8 +18,8 @@ def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.setServer("WorkloadManagement/JobMonitoring")
 
-    # Removed to avoid using it in ClientSelector
-    # diracxClient = futureJobMonitoringClient
+    # Set to NULL to avoid using it in ClientSelector
+    diracxClient = None
 
     @ignoreEncodeWarning
     def getJobsStatus(self, jobIDs):

tests/Jenkins/utilities.sh

@@ -255,12 +255,6 @@ installDIRAC() {
     done
   fi
 
-  echo "==> Installing main branch of diracx"
-  installDIRACX core client
-
-  echo "$DIRAC"
-  echo "$PATH"
-
   echo "==> Done installing, now configuring"
 
   if ! dirac-proxy-init --nocs --no-upload; then
@@ -285,6 +279,13 @@ installDIRAC() {
   fi
 
   echo '==> Done installDIRAC'
+
+  echo "==> Installing main branch of diracx"
+  installDIRACX core client
+
+  echo "$DIRAC"
+  echo "$PATH"
+
 }
 
 ##############################################################################