Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc updates to support cardinal #261

Merged
merged 7 commits into from
Oct 3, 2024
Merged

Misc updates to support cardinal #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9534ab2
change this file extension
johrstrom Sep 30, 2024
ef30cdf
udpate ondemand
johrstrom Sep 30, 2024
74eac56
change this files extension
johrstrom Sep 30, 2024
f3fb078
add cardinal vdi
johrstrom Sep 30, 2024
fd9e85d
actually add cardinal
johrstrom Sep 30, 2024
81e4ab6
add cardinal to shell allowlist
johrstrom Oct 3, 2024
9b1cb7b
remove cardinal from vdi for now
johrstrom Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions apps.awesim.org/apps/bc_desktop/submit/vdi.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%>
Expand Down
14 changes: 1 addition & 13 deletions apps.awesim.org/apps/bc_desktop/vdi.yml.erb → apps.awesim.org/apps/bc_desktop/vdi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: |
Expand All @@ -21,7 +16,7 @@ form:
- cluster
- bc_vnc_idle
- desktop
- account
- auto_accounts
- bc_num_hours
- bc_num_slots
- licenses
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion apps.awesim.org/apps/shell/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DEFAULT_SSHHOST=owens.osc.edu
OOD_DEFAULT_SSHHOST=owens.osc.edu
OOD_SSHHOST_ALLOWLIST="a[0-1][0-9][0-9][0-9].ten.osc.edu:o[0-1][0-9][0-9][0-9].ten.osc.edu:p[0-1][0-9][0-9][0-9].ten.osc.edu:apps-test.awesim.org"
OOD_SSHHOST_ALLOWLIST="a[0-1][0-9][0-9][0-9].ten.osc.edu:o[0-1][0-9][0-9][0-9].ten.osc.edu:p[0-1][0-9][0-9][0-9].ten.osc.edu:c[0-1][0-9][0-9][0-9].ten.osc.edu"
3 changes: 1 addition & 2 deletions ondemand.osc.edu/apps/bc_desktop/submit/vdi.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -%>
Expand Down
14 changes: 1 addition & 13 deletions ondemand.osc.edu/apps/bc_desktop/vdi.yml.erb → ondemand.osc.edu/apps/bc_desktop/vdi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: |
Expand All @@ -21,7 +16,7 @@ form:
- cluster
- bc_vnc_idle
- desktop
- account
- auto_accounts
- bc_num_hours
- bc_num_slots
- licenses
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ondemand.osc.edu/apps/shell/env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DEFAULT_SSHHOST=owens.osc.edu
OOD_DEFAULT_SSHHOST=owens.osc.edu
OOD_SSHHOST_ALLOWLIST="a[0-1][0-9][0-9][0-9].ten.osc.edu:o[0-1][0-9][0-9][0-9].ten.osc.edu:p[0-1][0-9][0-9][0-9].ten.osc.edu:ondemand-test.osc.edu"
OOD_SSHHOST_ALLOWLIST="a[0-1][0-9][0-9][0-9].ten.osc.edu:o[0-1][0-9][0-9][0-9].ten.osc.edu:p[0-1][0-9][0-9][0-9].ten.osc.edu:c[0-1][0-9][0-9][0-9].ten.osc.edu"
Loading