From 02fd5a9fbcdb78466b9ce8194b2c3fcf61a2fb35 Mon Sep 17 00:00:00 2001 From: Chris Burr Date: Mon, 30 Oct 2023 13:23:22 +0100 Subject: [PATCH] TODO --- .../FutureClient/JobMonitoringClient.py | 6 ------ tests/Jenkins/utilities.sh | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/DIRAC/WorkloadManagementSystem/FutureClient/JobMonitoringClient.py b/src/DIRAC/WorkloadManagementSystem/FutureClient/JobMonitoringClient.py index eb6deff55a3..801425f410b 100644 --- a/src/DIRAC/WorkloadManagementSystem/FutureClient/JobMonitoringClient.py +++ b/src/DIRAC/WorkloadManagementSystem/FutureClient/JobMonitoringClient.py @@ -21,9 +21,6 @@ class JobMonitoringClient: def _fetch_summary(self, grouping, search=None): - diracxUrl = gConfig.getValue("/DiracX/URL") - if not diracxUrl: - raise ValueError("Missing mandatory /DiracX/URL configuration") with DiracXClient() as api: return api.jobs.summary(grouping=grouping, search=search) @@ -31,9 +28,6 @@ def _fetch_search(self, parameters, jobIDs): if not isinstance(jobIDs, list): jobIDs = [jobIDs] - diracxUrl = gConfig.getValue("/DiracX/URL") - if not diracxUrl: - raise ValueError("Missing mandatory /DiracX/URL configuration") with DiracXClient() as api: jobs = api.jobs.search( parameters=(["JobID"] + parameters) if parameters else None, diff --git a/tests/Jenkins/utilities.sh b/tests/Jenkins/utilities.sh index b44e99093b9..50065ccb90b 100644 --- a/tests/Jenkins/utilities.sh +++ b/tests/Jenkins/utilities.sh @@ -253,6 +253,8 @@ installDIRAC() { fi fi + pip install git+https://github.com/DIRACGrid/diracx.git + if [[ -n "${INSTALLATION_BRANCH}" ]]; then # Use this for (e.g.) running backward-compatibility tests echo "pip-installing DIRAC from git+https://github.com/DIRACGrid/DIRAC.git@${INSTALLATION_BRANCH}#egg=DIRAC[client]"