From 0370ab65fff69d8ecfe4dddb423f236c1cd9e570 Mon Sep 17 00:00:00 2001
From: Eric Le Lay <eric@stackhpc.com>
Date: Thu, 11 Dec 2025 17:59:02 +0100
Subject: [PATCH 1/2] ood: use auto_queues instead of bc_queue

in batch_connect, to let the user select the slurm partition from a drop-down list.
---
 .../inventory/group_vars/all/openondemand.yml | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/environments/common/inventory/group_vars/all/openondemand.yml b/environments/common/inventory/group_vars/all/openondemand.yml
index 1191250d9..19ef530b6 100644
--- a/environments/common/inventory/group_vars/all/openondemand.yml
+++ b/environments/common/inventory/group_vars/all/openondemand.yml
@@ -120,7 +120,7 @@ openondemand_apps_desktop_default:
   cluster: slurm
   form:
     - desktop
-    - bc_queue
+    - auto_queues
     - bc_num_hours
     - num_cores
     - gres
@@ -128,7 +128,7 @@ openondemand_apps_desktop_default:
     - node
   attributes:
     desktop: xfce
-    bc_queue:
+    auto_queues:
       value: "{{ openondemand_desktop_partition | default(none) }}"
     num_cores:
       label: Number of cores
@@ -175,7 +175,7 @@ openondemand_apps_jupyter_default:
   form:
     - modules
     - extra_jupyter_args
-    - bc_queue
+    - auto_queues
     - bc_num_hours
     - num_cores
     - gres
@@ -205,7 +205,7 @@ openondemand_apps_jupyter_default:
       help: Select a particular node or leave empty to let Slurm pick the next available
       value: ""
     extra_jupyter_args: ""
-    bc_queue:
+    auto_queues:
       value: "{{ openondemand_jupyter_partition | default(none) }}"
   submit: |
     ---
@@ -233,7 +233,7 @@ openondemand_apps_rstudio_default:
   description: Request a RStudio server
   cluster: slurm
   attributes:
-    bc_queue:
+    auto_queues:
       value: "{{ openondemand_rstudio_partition | default(none) }}"
     rstudio_module:
       label: RStudio module
@@ -292,9 +292,8 @@ openondemand_apps_rstudio_default:
       min: 1
       step: 1
   form:
-    - bc_queue
-    - rstudio_module
     - auto_queues
+    - rstudio_module
     - extra_modules_script
     - cores
     - ram
@@ -312,7 +311,7 @@ openondemand_apps_rstudio_default:
     script:
       native:
         - "--partition"
-        - "<%= bc_queue %>"
+        - "<%= auto_queues %>"
         - "--ntasks"
         - "1"
         - "--mem"
@@ -332,7 +331,7 @@ openondemand_apps_matlab_default:
   cluster: slurm
   form:
     - desktop
-    - bc_queue
+    - auto_queues
     - bc_num_hours
     - matlab_module
     - cores
@@ -343,7 +342,7 @@ openondemand_apps_matlab_default:
     desktop: xfce
     # bc_account: # i.e. slurm account
     #   value: root
-    bc_queue:
+    auto_queues:
       value: "{{ openondemand_matlab_partition | default(none) }}"
     matlab_module:
       label: MATLAB module
@@ -399,7 +398,7 @@ openondemand_apps_matlab_default:
       job_name: "ood-matlab"
       native:
         - "--partition"
-        - "<%= bc_queue %>"
+        - "<%= auto_queues %>"
         - "--ntasks"
         - "1"
         - "--mem"
@@ -416,7 +415,7 @@ openondemand_apps_codeserver_default:
   description: Request a Code Server
   cluster: slurm
   form:
-    - bc_queue
+    - auto_queues
     - bc_num_hours
     - codeserver_module
     - cores
@@ -430,7 +429,7 @@ openondemand_apps_codeserver_default:
       widget: select
       options:
         - ["Code Server v{{ openondemand_code_server_version}}", "code-server/{{ openondemand_code_server_version }}"]
-    bc_queue:
+    auto_queues:
       value: "{{ openondemand_codeserver_partition | default(none) }}"
     cores:
       label: Number of CPU cores
@@ -467,7 +466,7 @@ openondemand_apps_codeserver_default:
       job_name: "ood-codeserver"
       native:
         - "--partition"
-        - "<%= bc_queue %>"
+        - "<%= auto_queues %>"
         - "--ntasks"
         - "1"
         - "--mem"

From b2c58ea5fc9e5986f4bec28ba8813f2c9754311f Mon Sep 17 00:00:00 2001
From: Eric Le Lay <eric@stackhpc.com>
Date: Thu, 11 Dec 2025 17:59:46 +0100
Subject: [PATCH 2/2] ood: desktop and jupyter: fix missing partition

---
 environments/common/inventory/group_vars/all/openondemand.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/environments/common/inventory/group_vars/all/openondemand.yml b/environments/common/inventory/group_vars/all/openondemand.yml
index 19ef530b6..450a2f98c 100644
--- a/environments/common/inventory/group_vars/all/openondemand.yml
+++ b/environments/common/inventory/group_vars/all/openondemand.yml
@@ -156,6 +156,8 @@ openondemand_apps_desktop_default:
     script:
       job_name: "ood-desktop"
       native:
+        - "--partition"
+        - "<%= auto_queues %>"
         - <%= "--nodes=1" %>
         - <%= "--ntasks=#{num_cores}" %>
         <% if node != '' %>
@@ -218,6 +220,8 @@ openondemand_apps_jupyter_default:
     script:
       job_name: "ood-jupyter"
       native:
+        - "--partition"
+        - "<%= auto_queues %>"
         - <%= "--nodes=1" %>
         - <%= "--ntasks=#{num_cores}" %>
         <% if node != '' %>