add cardinal vdi

OSC · Sep 30, 2024 · f3fb078 · f3fb078
1 parent 74eac56
commit f3fb078
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/apps.awesim.org/apps/bc_desktop/submit/vdi.yml.erb b/apps.awesim.org/apps/bc_desktop/submit/vdi.yml.erb
@@ -15,13 +15,12 @@ batch_connect:
  export SLURM_EXPORT_ENV=ALL
 
 script:
- accounting_id: "<%= account %>"
  job_environment:
  XDG_RUNTIME_DIR: "/tmp/xdg_runtime"
  SINGULARITY_ENVXDG_RUNTIME_DIR: "/tmp/xdg_runtime"
  APPTAINER_ENVXDG_RUNTIME_DIR: "/tmp/xdg_runtime"
  native:
- <%- if cluster == 'ascend-login' -%>
+ <%- if ['ascend-login', 'cardinal-login'].include?(cluster) -%>
  singularity_container: "/apps/project/ondemand/singularity/mate-rhel8/mate-rhel8.sif"
  singularity_bindpath: "/run,/apps"
  <%- else -%>

diff --git a/apps.awesim.org/apps/bc_desktop/vdi.yml b/apps.awesim.org/apps/bc_desktop/vdi.yml
@@ -1,8 +1,3 @@
-<%-
- groups = OodSupport::User.new.groups.sort_by(&:id).tap { |groups|
- groups.unshift(groups.delete(OodSupport::Process.group))
- }.map(&:name).grep(/^P./)
--%>
 ---
 title: "Lightweight Desktop"
 description: |
@@ -21,7 +16,7 @@ form:
  - cluster
  - bc_vnc_idle
  - desktop
- - account
+ - auto_accounts
  - bc_num_hours
  - bc_num_slots
  - licenses
@@ -65,13 +60,6 @@ attributes:
  pattern: '^([\w]+@osc:\d+,{0,1})+$'
  node_type: ":ppn=1"
  bc_email_on_started: 0
- account:
- label: "Project"
- widget: select
- options:
- <%- groups.each do |group| %>
- - "<%= group %>"
- <%- end %>
  bc_vnc_idle: 0
  bc_vnc_resolution:
  required: true