From c73d3fdb90d75503822b67a6acadf1329f7301a4 Mon Sep 17 00:00:00 2001
From: Stefano Belforte <stefano.belforte@cern.ch>
Date: Sun, 2 Jun 2024 16:51:22 +0200
Subject: [PATCH] do not set RequestCpus in task submission JDL. Fix #8456

---
 src/python/TaskWorker/Actions/DagmanSubmitter.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/python/TaskWorker/Actions/DagmanSubmitter.py b/src/python/TaskWorker/Actions/DagmanSubmitter.py
index 212111f2cf..095dd1f697 100644
--- a/src/python/TaskWorker/Actions/DagmanSubmitter.py
+++ b/src/python/TaskWorker/Actions/DagmanSubmitter.py
@@ -70,7 +70,6 @@
     ('+CRAB_SiteBlacklist', 'siteblacklist'),
     ('+CRAB_SiteWhitelist', 'sitewhitelist'),
     ('+RequestMemory', 'tm_maxmemory'),
-    ('+RequestCpus', 'tm_numcores'),
     ('+MaxWallTimeMins', 'tm_maxjobruntime'),
     ('+MaxWallTimeMinsRun', 'tm_maxjobruntime'),
     ('+MaxWallTimeMinsProbe', 'maxproberuntime'),
@@ -479,7 +478,7 @@ def submitDirect(self, schedd, cmd, arg, info): #pylint: disable=R0201
         jobJDL["JobUniverse"] = 7
         jobJDL["HoldKillSig"] = "SIGUSR1"
         jobJDL["X509UserProxy"] = info['user_proxy']
-        jobJDL["Requirements"] = "True || False"
+        jobJDL["Requirements"] = "True"
         environmentString = "PATH=/usr/bin:/bin CRAB3_VERSION=3.3.0-pre1"
         environmentString += " CONDOR_ID=$(ClusterId).$(ProcId)"
         environmentString += " " + " ".join(info['additional_environment_options'].split(';'))