feat: add batchSystem type in jobParameters

Author: aldbr

src/DIRAC/Resources/Computing/BatchSystems/TimeLeft/test/Test_PBSResourceUsage.py

@@ -76,7 +76,6 @@ def test_getResourcUsage(mocker):
         side_effect=[S_OK(RRCKI_OUT)],
     )
     mocker.patch("os.path.isfile", return_value=True)
-    mocker.patch.dict(os.environ, {"PBS_O_QUEUE": "lhcb", "PBS_O_QPATH": "/some/path"})
 
     pbsRU = PBSResourceUsage("55755440.seer.t1.grid.kiae.ru", {"Queue": "lhcb", "BinaryPath": "/some/path"})
     res = pbsRU.getResourceUsage()

src/DIRAC/Resources/Computing/BatchSystems/TimeLeft/test/Test_SGEResourceUsage.py

@@ -46,7 +46,7 @@ def test_getResourceUsage(mocker):
         return_value=S_OK(RESULT_FROM_SGE),
     )
 
-    sgeResourceUsage = SGEResourceUsage()
+    sgeResourceUsage = SGEResourceUsage("1234", {"Queue": "Test"})
     res = sgeResourceUsage.getResourceUsage()
 
     assert res["OK"]

src/DIRAC/Resources/Computing/BatchSystems/TimeLeft/test/Test_TimeLeft.py

@@ -24,7 +24,7 @@ def test_batchSystemNotDefined(mocker):
     tl.cpuPower = 10
     res = tl.getTimeLeft()
     assert not res["OK"]
-    assert res["Message"] == "Current batch system is not supported"
+    assert "Current batch system is not supported" in res["Message"]
 
 
 def test_getScaledCPU(mocker):

src/DIRAC/WorkloadManagementSystem/Agent/JobAgent.py

@@ -286,6 +286,9 @@ def execute(self):
         if queue:
             self.jobReport.setJobParameter(par_name="CEQueue", par_value=queue, sendFlag=False)
 
+        if batchSystem := gConfig.getValue("/LocalSite/BatchSystem/Type", ""):
+            self.jobReport.setJobParameter(par_name="BatchSystem", par_value=batchSystem, sendFlag=False)
+
         self.log.debug(f"Before self._submitJob() ({self.ceName}CE)")
         result = self._submitJob(
             jobID=jobID,