change cloud site option

    default is universe vanilla
    condocker has no requirements and so default for ekp jobs

classes/JDLCreator.py

@@ -15,7 +15,7 @@ class CloudSite(object):
         if name == 'condocker':
             self.universe = "docker"
             self.docker_image = "mschnepf/slc6-condocker"
-            self.requirements = '(TARGET.CLOUD_SITE == "condocker")'
+
         elif name == 'ekpcloud':
             self.universe = "vanilla"
             self.requirements = '(TARGET.CLOUD_SITE == "ekpcloud")'
@@ -23,7 +23,7 @@ class CloudSite(object):
         elif name == 'ekpsupermachines':
             self.universe = "docker"
             self.docker_image = "mschnepf/slc6-condocker"
-            self.requirements = '(TARGET.CLOUD_SITE == "ekpsupermachines")'
+            self.requirements = '(TARGET.CLOUDSITE == "ekpsupermachines")'
 
         elif name == 'bwforcluster':
             self.universe = "vanilla"
@@ -36,9 +36,9 @@ class CloudSite(object):
         elif name == 'oneandone':
             self.universe = "vanilla"
             self.requirements = '(TARGET.CLOUD_SITE == "oneandone")'
+
         else:
-            self.universe = "docker"
-            self.docker_image = "mschnepf/slc6-condocker"
+            self.universe = "vanilla"
             self.requirements = ""
 
 

create_jdl.py

@@ -3,7 +3,7 @@ from classes.JDLCreator import JDLCreator # import the class to create and submi
 import numpy
 
 def main():
-    jobs = JDLCreator()  #run jobs on condocker cloude site
+    jobs = JDLCreator("condocker")  #run jobs on condocker cloude site
     ##################################
     # submit job 
     ##################################

example_belle2.py

@@ -3,7 +3,7 @@ from classes.JDLCreator import JDLCreator # import the class to create and submi
 import numpy
 
 def main():
-    jobs = JDLCreator()  #run jobs on condocker cloude site
+    jobs = JDLCreator("condocker")  #run jobs on condocker cloude site
     jobs.image = "ipython:v1_r26519_v01-01-07_r28283"
     ##################################
     # submit job