Merge pull request #5982 from DIRACGridBot/cherry-pick-2-381df2fcb-integration

[sweep:integration] Fix PushJobAgent

Author: Andrei Tsaregorodtsev

src/DIRAC/WorkloadManagementSystem/Agent/PushJobAgent.py

@@ -152,7 +152,7 @@ def execute(self):
 
         # Check that there is enough slots locally
         result = self._checkCEAvailability(self.computingElement)
-        if not result["OK"]:
+        if not result["OK"] or result["Value"]:
             return result
 
         for queueName, queueDictionary in queueDictItems:
@@ -177,7 +177,7 @@ def execute(self):
 
             # Check that there is enough slots in the remote CE to match a job
             result = self._checkCEAvailability(ce)
-            if not result["OK"] or (result["OK"] and result["Value"]):
+            if not result["OK"] or result["Value"]:
                 self.failedQueues[queueName] += 1
                 continue
 
@@ -317,12 +317,12 @@ def execute(self):
 
                     # Check that there is enough slots locally
                     result = self._checkCEAvailability(self.computingElement)
-                    if not result["OK"]:
+                    if not result["OK"] or result["Value"]:
                         return result
 
                     # Check that there is enough slots in the remote CE to match a new job
                     result = self._checkCEAvailability(ce)
-                    if not result["OK"] or (result["OK"] and result["Value"]):
+                    if not result["OK"] or result["Value"]:
                         self.failedQueues[queueName] += 1
                         break
 

src/DIRAC/WorkloadManagementSystem/scripts/dirac_jobexec.py

@@ -26,6 +26,7 @@ def main():
     # from DIRAC.Core.Workflow.Parameter import *
     from DIRAC import gLogger
     from DIRAC.Core.Workflow.Workflow import fromXMLFile
+    from DIRAC.Core.Utilities.Proxy import executeWithoutServerCertificate
     from DIRAC.WorkloadManagementSystem.Client.JobReport import JobReport
     from DIRAC.AccountingSystem.Client.DataStoreClient import DataStoreClient
     from DIRAC.RequestManagementSystem.Client.Request import Request
@@ -34,6 +35,7 @@ def main():
     sys.path.insert(0, os.path.realpath("."))
     gLogger.showHeaders(True)
 
+    @executeWithoutServerCertificate
     def jobexec(jobxml, wfParameters):
         jobfile = os.path.abspath(jobxml)
         if not os.path.exists(jobfile):