Merge pull request #10 from aperloff/detectOS

Automated host OS detection
kpedro88 · May 21, 2020 · 5136110 · 5136110
2 parents f349c5e + 21e98f9
commit 5136110
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/python/jobSubmitter.py b/python/jobSubmitter.py
@@ -282,6 +282,7 @@ def generateStep1(self,job):
 
     def generateExtra(self,job):
         job.patterns.update([
+            ("OSVERSION","rhel7" if "el7" in os.uname()[2] else "rhel6"),
             ("MYDISK",self.disk),
             ("MYMEMORY",self.memory),
             ("MYCPUS",self.cpus),

diff --git a/scripts/jobExecCondor.jdl b/scripts/jobExecCondor.jdl
@@ -1,6 +1,6 @@
 universe = vanilla
 Executable = jobExecCondor.sh
-+REQUIRED_OS = "rhel6"
++REQUIRED_OS = "OSVERSION"
 +DesiredOS = REQUIRED_OS
 request_disk = MYDISK
 request_memory = MYMEMORY