wn singularity image

Author: dciangot

dask_remote_jobqueue/dask_remote_jobqueue.py

@@ -54,6 +54,7 @@ def __init__(
         ssh_url_port: int = 8122,
         asynchronous: bool = True,  # Set by dask-labextension but not used in this class
         sitename: str = "",
+        singularity_wn_image = "/cvmfs/images.dodas.infn.it/registry.hub.docker.com/dodasts/root-in-docker:ubuntu22-kernel-v1",
         debug: bool = True,
     ):
         self.__debug = debug
@@ -116,6 +117,8 @@ def __init__(
         self.cluster_id: str = ""
         self.sitename: str = sitename
 
+        self.singularity_wn_image: str = singularity_wn_image
+
         # Jupyter env vars
         self.username = (
             os.environ.get("JUPYTERHUB_USER", user) + f"-{self.sched_port}.dask-ssh"
@@ -363,7 +366,7 @@ async def _start(self):
 
             if self.start_sched_process is None:
                 self.start_sched_process = StartDaskScheduler(
-                    weakref.proxy(self), self.start_sched_process_q, os.environ
+                    weakref.proxy(self), self.start_sched_process_q, os.environ, self.singularity_wn_image
                 )
                 logger.debug("[_start][start sched process...]")
                 self.start_sched_process.start()

dask_remote_jobqueue/templates/scheduler.sub

@@ -10,5 +10,5 @@ when_to_transfer_output = ON_EXIT
 +SingularityImage = "/cvmfs/images.dodas.infn.it/registry.hub.docker.com/dodasts/dask-scheduler:v1"
 {{ selected_sitename }}
 transfer_input_files = start_scheduler.py, scheduler.sh, /ca.crt, /tmp/token, job_submit.sh, job_rm.sh, .bashrc, config.yaml, entrypoint.sh
-environment = HOME=./; OIDC_CONFIG_DIR=./.oidc-agent; TUNNEL_SERVICE_IP={{ tunnel_service_ip }}; TUNNEL_SERVICE_PORT={{ tunnel_service_port }}; JHUB_TOKEN={{ token }};JHUB_USER={{ name }};SCHED_PORT={{ sched_port }};DASH_PORT={{ dash_port }};CONTROLLER_PORT={{ controller_port }};REFRESH_TOKEN={{ refresh_token }};IAM_SERVER={{ iam_server }};IAM_CLIENT_ID={{ client_id }};IAM_CLIENT_SECRET={{ client_secret }};_condor_AUTH_SSL_CLIENT_CAFILE={{ htc_ca }};_condor_TOOL_DEBUG={{ htc_debug }};_condor_COLLECTOR_HOST={{ htc_collector }}; _condor_SCHEDD_HOST={{ htc_schedd_host }};_condor_SCHEDD_NAME={{ htc_schedd_name }};_condor_SCITOKENS_FILE={{ htc_scitoken_file }};_condor_SEC_DEFAULT_AUTHENTICATION_METHODS={{ htc_sec_method}}
+environment = HOME=./; OIDC_CONFIG_DIR=./.oidc-agent; TUNNEL_SERVICE_IP={{ tunnel_service_ip }}; TUNNEL_SERVICE_PORT={{ tunnel_service_port }}; JHUB_TOKEN={{ token }};JHUB_USER={{ name }};SCHED_PORT={{ sched_port }};DASH_PORT={{ dash_port }};CONTROLLER_PORT={{ controller_port }};REFRESH_TOKEN={{ refresh_token }};IAM_SERVER={{ iam_server }};IAM_CLIENT_ID={{ client_id }};IAM_CLIENT_SECRET={{ client_secret }};_condor_AUTH_SSL_CLIENT_CAFILE={{ htc_ca }};_condor_TOOL_DEBUG={{ htc_debug }};_condor_COLLECTOR_HOST={{ htc_collector }}; _condor_SCHEDD_HOST={{ htc_schedd_host }};_condor_SCHEDD_NAME={{ htc_schedd_name }};_condor_SCITOKENS_FILE={{ htc_scitoken_file }};_condor_SEC_DEFAULT_AUTHENTICATION_METHODS={{ htc_sec_method}};SINGULARITY_WN_IMAGE={{ singularity_wn_image }}
 queue

dask_remote_jobqueue/templates/start_scheduler.py

@@ -81,6 +81,7 @@ def __init__(self, *args, **kwargs):
 sched_port = int(os.environ.get("SCHED_PORT", "42000"))
 dash_port = int(os.environ.get("DASH_PORT", "42001"))
 controller_port = int(os.environ.get("CONTROLLER_PORT", "42002"))
+singularity_wn_image = os.environ.get("SINGULARITY_WN_IMAGE", "/cvmfs/images.dodas.infn.it/registry.hub.docker.com/dodasts/root-in-docker:ubuntu22-kernel-v1")
 tunnel_service_ip = os.environ.get(
     "TUNNEL_SERVICE_IP", "jhub.131.154.96.124.myip.cloud.infn.it"
 )
@@ -113,7 +114,7 @@ def __init__(self, *args, **kwargs):
 }
 job_extra_vars = {
     "+OWNER": '"' + name.split("-")[0] + '"',
-    "+SingularityImage": '"/cvmfs/images.dodas.infn.it/registry.hub.docker.com/dodasts/root-in-docker:ubuntu22-kernel-v1"',
+    "+SingularityImage": singularity_wn_image,
     "log": "wn.log",
     "output": "wn.out",
     "error": "wn.error",

dask_remote_jobqueue/utils.py

@@ -385,9 +385,11 @@ def __init__(
         remoteHTCondor: weakref.ProxyType,
         queue: "Queue",
         environ: os._Environ,
+        singularity_wn_image: "/cvmfs/images.dodas.infn.it/registry.hub.docker.com/dodasts/root-in-docker:ubuntu22-kernel-v1",
     ):
         logger.debug("[StartDaskScheduler][init]")
         super().__init__()
+        self.singularity_wn_image = singularity_wn_image
         self._remoteHTCondor: weakref.ProxyType = remoteHTCondor
         self._queue: "Queue" = queue
         self._environ: os._Environ = environ
@@ -522,6 +524,7 @@ def run(self):
                         htc_scitoken_file=self._htc_scitoken_file,
                         htc_sec_method=self._htc_sec_method,
                         selected_sitename=selected_sitename,
+                        singularity_wn_image=self.singularity_wn_image
                     )
 
                     logger.debug(f"[StartDaskScheduler][run][{dest.name}]")

version.py

@@ -2,9 +2,9 @@
 # Distributed under the terms of the Modified BSD License.
 
 version_info = (
+    1,
+    0,
     0,
-    5,
-    9,
     # "dev",  # comment-out this line for a release
 )
 __version__ = ".".join(map(str, version_info))