From 2bb18e1747738b2535944a62db46665d74137aca Mon Sep 17 00:00:00 2001
From: Tommaso Tedeschi <tedesk95@gmail.com>
Date: Mon, 12 Feb 2024 17:12:36 +0100
Subject: [PATCH 1/5] Update start_scheduler.py

---
 .../templates/start_scheduler.py               | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/dask_remote_jobqueue/templates/start_scheduler.py b/dask_remote_jobqueue/templates/start_scheduler.py
index 8161cc3..fb9bd1b 100644
--- a/dask_remote_jobqueue/templates/start_scheduler.py
+++ b/dask_remote_jobqueue/templates/start_scheduler.py
@@ -296,7 +296,7 @@ def run(self):
 async def tunnel_scheduler():
     logger.debug("start tunnel scheduler")
     connection = await asyncssh.connect(
-        "jhub.131.154.96.124.myip.cloud.infn.it",
+        "jhub.131.154.98.185.myip.cloud.infn.it",
         port=31022,
         username=name,
         password=token,
@@ -311,7 +311,7 @@ async def tunnel_scheduler():
 async def tunnel_dashboard():
     logger.debug("start tunnel dashboard")
     connection = await asyncssh.connect(
-        "jhub.131.154.96.124.myip.cloud.infn.it",
+        "jhub.131.154.98.185.myip.cloud.infn.it",
         port=31022,
         username=name,
         password=token,
@@ -326,7 +326,7 @@ async def tunnel_dashboard():
 async def tunnel_controller():
     logger.debug("start tunnel controller")
     connection = await asyncssh.connect(
-        "jhub.131.154.96.124.myip.cloud.infn.it",
+        "jhub.131.154.98.185.myip.cloud.infn.it",
         port=31022,
         username=name,
         password=token,
@@ -389,7 +389,7 @@ def get(self):
     def prepare(self):
         logger.debug(self.request.arguments)
 
-        
+
 class LogsHandler(tornado.web.RequestHandler):
     def initialize(self, sched_q: Queue, controller_q: Queue):
         self.sched_q: Queue = sched_q
@@ -424,22 +424,18 @@ async def get(self):
                 font-size: 15px;
                 border-bottom: 
             }
-
             .active, .collapsible:hover {
                 background-color: #ec8f72;
             }
-
             .content {
                 padding: 0 18px;
                 display: none;
                 overflow: hidden;
                 background-color: #fafafa;
             }
-
             table, th, td {
                 border: 1px solid black;
             }
-
             table {
                 width: 100%;
             }
@@ -545,7 +541,6 @@ async def get(self):
             """<script>
     var coll = document.getElementsByClassName("collapsible");
     var i;
-
     for (i = 0; i < coll.length; i++) {
     coll[i].addEventListener("click", function() {
         this.classList.toggle("active");
@@ -557,12 +552,9 @@ async def get(self):
         }
     });
     }
-
     window.onscroll = function() {myFunction()};
-
     var header = document.getElementById("myHeader");
     var sticky = header.offsetTop;
-
     function myFunction() {
     if (window.pageYOffset > sticky) {
         header.classList.add("sticky");
@@ -570,7 +562,6 @@ async def get(self):
         header.classList.remove("sticky");
     }
     }
-
     var origin_location = window.location.href;
     function reload() {
         window.location.href = origin_location;
@@ -666,7 +657,6 @@ def initialize(self, sched_q: Queue, controller_q: Queue):
 
     def get(self):
         """Return a descriptive dictionary of worker specs.
-
         Example worker_spec:
             {
                 "HTCondorCluster-0": {

From a73db629fb66b18275b3443d9202fe44c9821f0d Mon Sep 17 00:00:00 2001
From: Tommaso Tedeschi <tedesk95@gmail.com>
Date: Tue, 13 Feb 2024 09:48:08 +0100
Subject: [PATCH 2/5] Update scheduler.sub

---
 dask_remote_jobqueue/templates/scheduler.sub | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dask_remote_jobqueue/templates/scheduler.sub b/dask_remote_jobqueue/templates/scheduler.sub
index 101275e..1c0cc2b 100644
--- a/dask_remote_jobqueue/templates/scheduler.sub
+++ b/dask_remote_jobqueue/templates/scheduler.sub
@@ -5,7 +5,7 @@ executable = scheduler.sh
 log        = dask_scheduler.log
 output     = dask_scheduler.out
 error      = dask_scheduler.error
-+SingularityImage = "/cvmfs/images.dodas.infn.it/registry.hub.docker.com/dodasts/dask-scheduler:v1"
++SingularityImage = "/cvmfs/unpacked.cern.ch/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
 environment = HOME=./; OIDC_CONFIG_DIR=./.oidc-agent; 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 }}

From 2f94bfb8a51c54845c7b0545aee93b56f7a6248d Mon Sep 17 00:00:00 2001
From: Tommaso Tedeschi <tedesk95@gmail.com>
Date: Tue, 13 Feb 2024 09:52:54 +0100
Subject: [PATCH 3/5] Update job_submit.sh

---
 dask_remote_jobqueue/templates/job_submit.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dask_remote_jobqueue/templates/job_submit.sh b/dask_remote_jobqueue/templates/job_submit.sh
index ea8fcdd..6f150cd 100644
--- a/dask_remote_jobqueue/templates/job_submit.sh
+++ b/dask_remote_jobqueue/templates/job_submit.sh
@@ -15,4 +15,5 @@ export _condor_SCHEDD_NAME={{ htc_schedd_name }}
 export _condor_SCITOKENS_FILE={{ htc_scitoken_file }}
 export _condor_SEC_DEFAULT_AUTHENTICATION_METHODS={{ htc_sec_method}}
 
+cat $@
 condor_submit -spool $@

From 50713682cf544e79bde4791e0d9d95a0585871da Mon Sep 17 00:00:00 2001
From: Tommaso Tedeschi <tedesk95@gmail.com>
Date: Tue, 13 Feb 2024 11:17:50 +0100
Subject: [PATCH 4/5] Update start_scheduler.py

---
 dask_remote_jobqueue/templates/start_scheduler.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dask_remote_jobqueue/templates/start_scheduler.py b/dask_remote_jobqueue/templates/start_scheduler.py
index fb9bd1b..9499e74 100644
--- a/dask_remote_jobqueue/templates/start_scheduler.py
+++ b/dask_remote_jobqueue/templates/start_scheduler.py
@@ -81,7 +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")
+singularity_wn_image = os.environ.get("SINGULARITY_WN_IMAGE", "/cvmfs/unpacked.cern.ch/registry.hub.docker.com/dodasts/root-in-docker:ubuntu22-kernel-v1")
 
 logger.debug(f"name: {name}")
 logger.debug(f"token: {token}")
@@ -110,7 +110,7 @@ def __init__(self, *args, **kwargs):
 }
 job_extra_vars = {
     "+OWNER": '"' + name.split("-")[0] + '"',
-    "+SingularityImage": singularity_wn_image,
+    "+SingularityImage": '"' + singularity_wn_image + '"',
     "log": "wn.log",
     "output": "wn.out",
     "error": "wn.error",

From 7e9b1cf032cf067da082079b627de78e619e42c0 Mon Sep 17 00:00:00 2001
From: Tommaso Tedeschi <tedesk95@gmail.com>
Date: Tue, 13 Feb 2024 12:46:34 +0100
Subject: [PATCH 5/5] Update start_scheduler.py

---
 dask_remote_jobqueue/templates/start_scheduler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dask_remote_jobqueue/templates/start_scheduler.py b/dask_remote_jobqueue/templates/start_scheduler.py
index 9499e74..2f1d45c 100644
--- a/dask_remote_jobqueue/templates/start_scheduler.py
+++ b/dask_remote_jobqueue/templates/start_scheduler.py
@@ -110,7 +110,7 @@ def __init__(self, *args, **kwargs):
 }
 job_extra_vars = {
     "+OWNER": '"' + name.split("-")[0] + '"',
-    "+SingularityImage": '"' + singularity_wn_image + '"',
+    "+SingularityImage": singularity_wn_image,
     "log": "wn.log",
     "output": "wn.out",
     "error": "wn.error",