fix(resources): submit options should go in the sub file for Condor

Author: aldbr

src/DIRAC/Resources/Computing/BatchSystems/Condor.py

@@ -157,15 +157,15 @@ def submitJob(self, **kwargs):
                 holdReasonSubcode=HOLD_REASON_SUBCODE,
                 daysToKeepRemoteLogs=1,
                 scheddOptions="",
-                extraString="",
+                extraString=submitOptions,
                 pilotStampList=",".join(stamps),
             )
         )
 
         jdlFile.flush()
 
         cmd = "%s; " % preamble if preamble else ""
-        cmd += "condor_submit %s %s" % (submitOptions, jdlFile.name)
+        cmd += "condor_submit %s -spool" % jdlFile.name
         sp = subprocess.Popen(
             cmd,
             shell=True,
@@ -379,3 +379,43 @@ def getCEStatus(self, **kwargs):
                 resultDict["Waiting"] += 1
 
         return resultDict
+
+    def getJobOutputFiles(self, **kwargs):
+        """Get output file names and templates for the specific CE"""
+        resultDict = {}
+
+        MANDATORY_PARAMETERS = ["JobIDList", "OutputDir", "ErrorDir"]
+        for argument in MANDATORY_PARAMETERS:
+            if argument not in kwargs:
+                resultDict["Status"] = -1
+                resultDict["Message"] = "No %s" % argument
+                return resultDict
+
+        outputDir = kwargs["OutputDir"]
+        errorDir = kwargs["ErrorDir"]
+        jobIDList = kwargs["JobIDList"]
+
+        cmd = "condor_transfer_data"
+        sp = subprocess.Popen(
+            shlex.split(cmd),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            universal_newlines=True,
+        )
+        _, error = sp.communicate()
+        status = sp.returncode
+
+        if status != 0:
+            resultDict["Status"] = -1
+            resultDict["Message"] = error
+            return resultDict
+
+        jobDict = {}
+        for jobID in jobIDList:
+            jobDict[jobID] = {}
+            jobDict[jobID]["Output"] = "%s/%s.out" % (outputDir, jobID)
+            jobDict[jobID]["Error"] = "%s/%s.err" % (errorDir, jobID)
+
+        resultDict["Status"] = 0
+        resultDict["Jobs"] = jobDict
+        return resultDict