WIP: debug rstudio app errors

Author: bertiethorpe

environments/common/inventory/group_vars/all/openondemand.yml

@@ -50,6 +50,7 @@ openondemand_clusters:
         basic:
           script_wrapper: |
             module purge
+            %s
           set_host: host=$(hostname -s)
         vnc:
           script_wrapper: |
@@ -99,7 +100,7 @@ openondemand_install_app_matlab:
 openondemand_install_app_codeserver:
   codeserver:
     repo: https://github.com/stackhpc/bc_osc_codeserver.git
-    version: main
+    version: master
 # osc:ood role var (NB only active when not in configure):
 ood_install_apps: >-
   {{
@@ -186,19 +187,9 @@ openondemand_apps_rstudio_default:
   title: RStudio
   description: Request a RStudio server
   cluster: slurm
-  form:
-    - bc_queue
-    - rstudio_module
-    - bc_num_hours
-    - num_cores
-    - node
   attributes:
-    num_cores:
-      label: Number of cores FOO
-      value: 1
-    bc_queue:
+    bc_queue: 
       value: "{{ openondemand_rstudio_partition | default(none) }}"
-    node: ""
     rstudio_module:
       label: RStudio module
       required: true
@@ -209,18 +200,67 @@ openondemand_apps_rstudio_default:
         - ["RStudio-Server/2022.07.2+576-foss-2022a-Java-11-R-4.2.1", "RStudio-Server/2022.07.2+576-foss-2022a-Java-11-R-4.2.1"]
         - ["RStudio-Server/1.4.1717-foss-2021a-Java-11-R-4.1.0", "RStudio-Server/1.4.1717-foss-2021a-Java-11-R-4.1.0"]
         - ["RStudio-Server/2023.09.1+494-foss-2023a-Java-11-R-4.3.2", "RStudio-Server/2023.09.1+494-foss-2023a-Java-11-R-4.3.2"]
+    extra_modules_script:
+      label: Extra modules script
+      help: If you'd like to load additional modules alongside RStudio-Server, put the 'module load ...' commands into a text file (one 'module load...' per line) and specify its path here
+      widget: text_field
+      required: false
+    cores:
+      label: Number of CPU cores
+      help: How many CPU cores to reserve for your session. NB Ensure this is within the maximum allowed by your chosen partition.
+      widget: number_field
+      min: 1
+      max: 48
+      step: 1
+      value: 1
+      cachable: true
+    ram:
+      widget: number_field
+      label: RAM in GB
+      help: How much RAM to reserve for your session. NB Ensure this is within the maximum allowed by your chosen partition
+      min: 4
+      max:  700
+      step: 1
+      value: 4
+      cachable: true
+    bc_num_hours:
+      widget: number_field
+      help: Maximum runtime in hours for your session. NB Ensure this is within the maximum allowed by your chosen partition
+      min: 1
+      max: 240
+      step: 1
+      value: 30
+      cachable: true
+    bc_email_on_started: false
+    auto_modules_RStudio-Server:
+      default: false
+  form:
+    - bc_queue
+    - rstudio_module
+    - auto_queues
+    - extra_modules_script
+    - cores
+    - ram
+    - bc_num_hours
+    - bc_email_on_started
   submit: |
     ---
     batch_connect:
       template: "basic"
       conn_params:
         - csrf_token
     script:
-      job_name: "ood-rstudio"
       native:
-        - <%= "--nodes=1" %>
-        - <%= "--ntasks=#{num_cores}" %>
-        - <%= "--nodelist=#{node}" %>
+        - "--partition"
+        - "<%= bc_queue %>"
+        - "--ntasks"
+        - "1"
+        - "--mem"
+        - "<%= ram.blank? ? 4 : ram.to_i %>G"
+        - "--cpus-per-task"
+        - "<%= cores.blank? ? 1 : cores.to_i %>"<% if auto_queues.start_with?("gpu") %>
+        - "--gpus-per-task"
+        - "1"<% end %>
 openondemand_apps_rstudio: "{{ {'rstudio':openondemand_apps_rstudio_default} if openondemand_rstudio_partition | default(none) else {} }}"
 
 openondemand_apps_matlab_default: