Revert "workaround for dmwm#8456 (dmwm#8466)"

This reverts commit 602f8d6.
belforte · Jun 5, 2024 · 758cf54 · 758cf54
1 parent b87b083
commit 758cf54
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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"] = "TARGET.Cpus == 1"  # see https://github.com/dmwm/CRABServer/issues/8456#issuecomment-2145887432
+        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(';'))