Linting changes

autolab · Dec 1, 2023 · 2e8a680 · 2e8a680
1 parent 8348ab5
commit 2e8a680
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/restful_tango/tangoREST.py b/restful_tango/tangoREST.py
@@ -153,7 +153,16 @@ def convertJobObj(self, dirName, jobObj):
             input.append(handinfile)
 
         # VM object
-        vm = self.createTangoMachine(jobObj["image"])
+        if "cores" in jobObj and "memory" in jobObj:
+            vm = self.createTangoMachine(
+                jobObj["image"],
+                vmObj={
+                    "cores": jobObj["cores"],
+                    "memory": jobObj["memory"],
+                },
+            )
+        else:
+            vm = self.createTangoMachine(jobObj["image"])
 
         # for backward compatibility
         accessKeyId = None

diff --git a/vmms/localDocker.py b/vmms/localDocker.py
@@ -157,6 +157,8 @@ def runJob(self, vm, runTimeout, maxOutputFileSize):
             )
         args = ["docker", "run", "--name", instanceName, "-v"]
         args = args + ["%s:%s" % (volumePath, "/home/mount")]
+        args = args + [f"--cpus={vm.cores}"]
+        args = args + ["-m", f"{vm.memory}m"]
         args = args + [vm.image]
         args = args + ["sh", "-c"]