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

add cardinal to lw desktops - and remove Gnome as an option #262

Merged
merged 1 commit into from
Oct 4, 2024
Merged

add cardinal to lw desktops - and remove Gnome as an option #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion apps.awesim.org/apps/bc_desktop/cardinal.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ attributes:
options:
- ["Xfce", "xfce"]
- ["Mate", "mate"]
- ["Gnome", "gnome"]
help: |
This will launch either the [Xfce] or [Mate] desktop environment on the
[Cardinal cluster].
Expand Down
10 changes: 7 additions & 3 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
@@ -1,6 +1,11 @@
<%-
args = [ "--partition", "quick", "--nodes", "1", "--ntasks-per-node", "1" ]
args.concat ["--licenses", "#{licenses}"] unless licenses.empty?

container_lookup = {
'ascend-login' => '/apps/project/ondemand/singularity/mate-rhel8/mate-rhel8.sif',
'cardinal-login' => '/apps/project/ondemand/lightdesktop_base/rhel9/rhel9.sif'
}
-%>
---
batch_connect:
Expand All @@ -9,19 +14,18 @@ batch_connect:
[[ $(type -t module) == "function" ]] && export -f module

# MATE doesn't like /var/run/$(id -u) and ascend-login doesn't have $TMPDIR
export XDG_RUNTIME_DIR="<%= cluster == 'ascend-login' ? '/tmp' : '$TMPDIR' %>/xdg_runtime"
export XDG_RUNTIME_DIR="<%= ['ascend-login', 'cardinal-login'].include?(cluster) ? '/tmp' : '$TMPDIR' %>/xdg_runtime"

# reset SLURM_EXPORT_ENV so that things like srun & sbatch work out of the box
export SLURM_EXPORT_ENV=ALL

script:
job_environment:
XDG_RUNTIME_DIR: "/tmp/xdg_runtime"
SINGULARITY_ENVXDG_RUNTIME_DIR: "/tmp/xdg_runtime"
APPTAINER_ENVXDG_RUNTIME_DIR: "/tmp/xdg_runtime"
native:
<%- if ['ascend-login', 'cardinal-login'].include?(cluster) -%>
singularity_container: "/apps/project/ondemand/singularity/mate-rhel8/mate-rhel8.sif"
singularity_container: "<%= container_lookup[cluster] %>"
singularity_bindpath: "/run,/apps"
<%- else -%>
<%- args.each do |arg| -%>
Expand Down
7 changes: 6 additions & 1 deletion apps.awesim.org/apps/bc_desktop/vdi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,18 @@ attributes:
- "owens"
- "pitzer"
- ["ascend", "ascend-login" ]
- ["cardinal", "cardinal-login" ]
desktop:
widget: select
label: "Desktop environment"
options:
- ["Xfce", "xfce"]
- ["Mate", "mate"]
- ["Gnome", "gnome", data-option-for-cluster-ascend-login: false ]
- [
"Gnome", "gnome",
data-option-for-cluster-ascend-login: false,
data-option-for-cluster-cardinal-login: false,
]
help: |
This will launch either the [Xfce] or [Mate] desktop environment on the
[Owens] or [Pitzer] clusters.
Expand Down
1 change: 0 additions & 1 deletion ondemand.osc.edu/apps/bc_desktop/cardinal.yml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ attributes:
options:
- ["Xfce", "xfce"]
- ["Mate", "mate"]
- ["Gnome", "gnome"]
help: |
This will launch either the [Xfce] or [Mate] desktop environment on the
[Cardinal cluster].
Expand Down
10 changes: 7 additions & 3 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
@@ -1,6 +1,11 @@
<%-
args = [ "--partition", "quick", "--nodes", "1", "--ntasks-per-node", "1" ]
args.concat ["--licenses", "#{licenses}"] unless licenses.empty?

container_lookup = {
'ascend-login' => '/apps/project/ondemand/singularity/mate-rhel8/mate-rhel8.sif',
'cardinal-login' => '/apps/project/ondemand/lightdesktop_base/rhel9/rhel9.sif'
}
-%>
---
batch_connect:
Expand All @@ -9,19 +14,18 @@ batch_connect:
[[ $(type -t module) == "function" ]] && export -f module

# MATE doesn't like /var/run/$(id -u) and ascend-login doesn't have $TMPDIR
export XDG_RUNTIME_DIR="<%= cluster == 'ascend-login' ? '/tmp' : '$TMPDIR' %>/xdg_runtime"
export XDG_RUNTIME_DIR="<%= ['ascend-login', 'cardinal-login'].include?(cluster) ? '/tmp' : '$TMPDIR' %>/xdg_runtime"

# reset SLURM_EXPORT_ENV so that things like srun & sbatch work out of the box
export SLURM_EXPORT_ENV=ALL

script:
job_environment:
XDG_RUNTIME_DIR: "/tmp/xdg_runtime"
SINGULARITY_ENVXDG_RUNTIME_DIR: "/tmp/xdg_runtime"
APPTAINER_ENVXDG_RUNTIME_DIR: "/tmp/xdg_runtime"
native:
<%- if ['ascend-login', 'cardinal-login'].include?(cluster) -%>
singularity_container: "/apps/project/ondemand/singularity/mate-rhel8/mate-rhel8.sif"
singularity_container: "<%= container_lookup[cluster] %>"
singularity_bindpath: "/run,/apps"
<%- else -%>
<%- args.each do |arg| -%>
Expand Down
7 changes: 6 additions & 1 deletion ondemand.osc.edu/apps/bc_desktop/vdi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,18 @@ attributes:
- "owens"
- "pitzer"
- ["ascend", "ascend-login" ]
- ["cardinal", "cardinal-login" ]
desktop:
widget: select
label: "Desktop environment"
options:
- ["Xfce", "xfce"]
- ["Mate", "mate"]
- ["Gnome", "gnome", data-option-for-cluster-ascend-login: false ]
- [
"Gnome", "gnome",
data-option-for-cluster-ascend-login: false,
data-option-for-cluster-cardinal-login: false,
]
help: |
This will launch either the [Xfce] or [Mate] desktop environment on the
[Owens] or [Pitzer] clusters.
Expand Down
Loading