Ood slurm accounts

ood/combined_desktop/form.yml.erb

@@ -14,9 +14,7 @@ cluster: "m3cluster"
 submit: submit.yml.erb
 
 form:
-<%- if CheckAccounts.Accounts.length() > 1 -%>
   - slurm_accounts
-<%- end -%>
   - custom_queues
   - desktop_os
   - desktop_env
@@ -29,19 +27,19 @@ form:
   - email_on_start
 
 attributes:
-<%- if CheckAccounts.Accounts.length() > 1 -%>
   slurm_accounts:
    widget: select
    label: "Slurm Account"
    help: |
-     Select a Slurm account. By default all users have a  default "smu" account.
-     You may have other accounts, e.g. to access course specific material or
-     special allocations.
+     Select a Slurm account. 
+     Slurm accounts grant to access allocations and/or course specific material.
+     **Important:** beginning on November 1, 2024. The Slurm account *smu* will
+     be disabled. Only Slurm accounts allocated with [ColdFront] will be usable.
+     [ColdFront]: https://hpcaccess.smu.edu 
    options:
     <%- CheckAccounts.Accounts.each do |q| -%>
     - [ "<%= q %>",  "<%= q %>" ]
     <%- end -%>
-<%- end -%>
   custom_queues:
     label: "Partition"
     widget: select

ood/jupyterlab/CheckAccounts.rb

@@ -0,0 +1 @@
+../common/CheckAccounts.rb

ood/jupyterlab/form.yml.erb

@@ -7,11 +7,15 @@ require_relative "CheckQueues"
 # find user conda environments
 require_relative "CustomEnvironments"
 
+# find slurm accounts
+require_relative "CheckAccounts"
+
 -%>
 
 ---
 cluster: "m3cluster"
 form:
+  - slurm_accounts
   - custom_queues
   - python_version
   - build_environment
@@ -28,6 +32,19 @@ form:
 # Define attribute values that aren't meant to be modified by the user within
 # the Dashboard form
 attributes:
+  slurm_accounts:
+   widget: select
+   label: "Slurm Account"
+   help: |
+     Select a Slurm account.
+     Slurm accounts grant to access allocations and/or course specific material.
+     **Important:** beginning on November 1, 2024. The Slurm account *smu* will
+     be disabled. Only Slurm accounts allocated with [ColdFront] will be usable.
+     [ColdFront]: https://hpcaccess.smu.edu 
+   options:
+    <%- CheckAccounts.Accounts.each do |q| -%>
+    - [ "<%= q %>",  "<%= q %>" ]
+    <%- end -%>
   custom_queues:
     label: "Partition"
     widget: select

ood/jupyterlab/submit.yml.erb

@@ -46,3 +46,7 @@ script:
     - "--mail-type"
     - "BEGIN"
     <%- end -%>
+    <%- if defined?slurm_accounts -%>
+    - "-A"
+    - "<%= slurm_accounts %>"
+    <%- end -%>

ood/rstudio/form.yml.erb

@@ -10,9 +10,7 @@ require_relative "CheckAccounts"
 ---
 cluster: "m3cluster"
 form:
-<%- if CheckAccounts.Accounts.length() > 1 -%>
   - slurm_accounts
-<%- end -%>
   - r_module
   - environment
   - custom_queues
@@ -23,19 +21,19 @@ form:
   - bc_num_gpus
   - email_on_start
 attributes:
-<%- if CheckAccounts.Accounts.length() > 1 -%>
   slurm_accounts:
    widget: select
    label: "Slurm Account"
    help: |
-     Select a Slurm account. By default all users have a  default "smu" account.
-     You may have other accounts, e.g. to access course specific material or
-     special allocations.
+     Select a Slurm account.
+     Slurm accounts grant to access allocations and/or course specific material.
+     **Important:** beginning on November 1, 2024. The Slurm account *smu* will
+     be disabled. Only Slurm accounts allocated with [ColdFront] will be usable.
+     [ColdFront]: https://hpcaccess.smu.edu 
    options:
     <%- CheckAccounts.Accounts.each do |q| -%>
     - [ "<%= q %>",  "<%= q %>" ]
     <%- end -%>
-<%- end -%>
   r_module:
     widget: select
     label: "R Version"

ood/rstudio/submit.yml.erb

@@ -22,3 +22,7 @@ script:
     - "--mail-type"
     - "BEGIN"
     <%- end -%>
+    <%- if defined?slurm_accounts -%>
+    - "-A"
+    - "<%= slurm_accounts %>"
+    <%- end -%>