Merge branch 'NEMO2' into 'master'

Add support for container universe and update default image

See merge request !46

0051.node_submit_values.cfg

@@ -34,7 +34,7 @@ JOB_DEFAULT_TRANSFEREXECUTABLE = TRUE
 REMOVE_SIGNIFICANT_ATTRIBUTES = GlobalJobId
 
 # Job transformations, e.g. set defaults
-JOB_TRANSFORM_NAMES = GPUJobs
+JOB_TRANSFORM_NAMES = GPUJobs, VanillaJobs, DockerJobs
 
 JOB_TRANSFORM_GPUJobs @=end
    # set default to hole GPU memory by requesting 1 GPU
@@ -42,6 +42,25 @@ JOB_TRANSFORM_GPUJobs @=end
    DEFAULT RequestGPUMemoryMB TARGET.TotalSlotGPUMemoryMB
 @end
 
+JOB_TRANSFORM_VanillaJobs @=end
+   # set default container to docker://cverstege/alma9-gridjob
+   REQUIREMENTS ContainerImage =?= undefined && DockerImage =?= undefined
+   COPY Requirements _OrigRequirements
+   SET Requirements (TARGET.HasContainer && TARGET.HasDockerURL) &&  _OrigRequirements
+   DEFAULT ContainerImage "docker://cverstege/alma9-gridjob"
+   DEFAULT WantContainer True
+   DEFAULT WantDockerImage True
+   DEFAULT HookKeyword SINGULARITY   
+@end
+
+
+JOB_TRANSFORM_DockerJobs @=end
+   # set JobWasRouted for docker jobs to allow them to run
+   REQUIREMENTS DockerImage =!= undefined
+   DEFAULT JobWasRouted True
+@end
+
+
 # Check job attributes during submission
 SUBMIT_REQUIREMENT_NAMES = GPUMemoryCheck
 SUBMIT_REQUIREMENT_GPUMemoryCheck = ifThenElse( isUndefined(RequestGPUMemoryMB), True, RequestGPUMemoryMB > 0 && RequestGPUs=?=1)

0055.node_submit_router.cfg

-### HPDA Schedd Setup
-### --------------------
-### To be used on nodes that allow job submission
-
-# launch job router to hook into submitted jobs
-DAEMON_LIST = $(DAEMON_LIST), JOB_ROUTER
-
-JOB_ROUTER_ARGS = -local-name JOB_ROUTER_EMPTY
-
-# router can poll frequently as hooks may skip frequent updates
-JOB_ROUTER_POLLING_PERIOD = 10
-# Increase ClassAd parser buffer character size (defaults to 10240) to handle large job ClassAds
-PIPE_BUFFER_MAX = 102400
-
-APPEND_REQUIREMENTS = ( JobWasRouted =?= TRUE )
-
-JOB_ROUTER_EMPTY.JOB_ROUTER_ENTRIES = \
-        [ \
-                name = "EmptyRouteRemote"; \
-                requirements = (  target.JobUniverse is 9 && target.JobWasRouted isnt TRUE ); \
-                MaxJobs = 1000000; \
-                GridResource = "NONE"; \
-                MaxIdleJobs = 1000000; \
-                set_JobWasRouted = TRUE; \
-                OverrideRoutingEntry = TRUE; \
-                EditJobInPlace = TRUE; \
-        ] \
-        [ \
-                name = "EmptyRouteVanilla"; \
-                requirements = ( target.JobUniverse is 5 && target.JobWasRouted isnt TRUE && target.WantDocker is undefined && ( target.INPUT_FILES is undefined || (TARGET.INPUT_FILES isnt undefined && TARGET.ExperimentalJob isnt True))  ) ; \
-                MaxJobs = 1000000; \
-                GridResource = "NONE"; \
-                MaxIdleJobs = 1000000; \
-                set_JobWasRouted = TRUE; \
-                set_WantDocker = True; \
-                set_DockerImage = "mschnepf/slc7-condocker"; \
-                set_HookKeyword = "SINGULARITY"; \
-                OverrideRoutingEntry = TRUE; \
-                EditJobInPlace = TRUE; \
-        ] \
-        [ \
-                name = "EmptyRouteDocker"; \
-                requirements = ( target.JobUniverse is 5 && target.JobWasRouted isnt TRUE && target.WantDocker is True && ( target.INPUT_FILES is undefined  || (TARGET.INPUT_FILES isnt undefined && TARGET.ExperimentalJob isnt True)) ); \
-                MaxJobs = 1000000; \
-                GridResource = "NONE"; \
-                MaxIdleJobs = 1000000; \
-                set_JobWasRouted = TRUE; \
-                set_HookKeyword = "SINGULARITY"; \
-                OverrideRoutingEntry = TRUE; \
-                EditJobInPlace = TRUE; \
-        ] \

0110.node_worker_docker.cfg

@@ -11,7 +11,7 @@ CGROUP_MEMORY_LIMIT_POLICY = soft
 
 ### For Docker
 DOCKER = /usr/bin/docker
-START = $(START) && TARGET.WantDocker =?= TRUE
+START = $(START)
 
 #Docker mounts
 DOCKER_VOLUMES = $(DOCKER_VOLUMES), CVMFS_DIR