diff --git a/apps.awesim.org/apps/bc_desktop/submit/vdi.yml.erb b/apps.awesim.org/apps/bc_desktop/submit/vdi.yml.erb index eda8a55..59fbeb1 100644 --- a/apps.awesim.org/apps/bc_desktop/submit/vdi.yml.erb +++ b/apps.awesim.org/apps/bc_desktop/submit/vdi.yml.erb @@ -4,7 +4,6 @@ container_lookup = { 'ascend-login' => '/apps/project/ondemand/singularity/mate-rhel8/mate-rhel8.sif', - 'cardinal-login' => '/apps/project/ondemand/lightdesktop_base/rhel9/rhel9.sif' } -%> --- @@ -21,7 +20,7 @@ batch_connect: export SLURM_EXPORT_ENV=ALL script: native: - <%- if ['ascend-login', 'cardinal-login'].include?(cluster) -%> + <%- if ['ascend-login'].include?(cluster) -%> singularity_container: "<%= container_lookup[cluster] %>" <%- else -%> <%- args.each do |arg| -%> diff --git a/apps.awesim.org/apps/bc_desktop/vdi.yml b/apps.awesim.org/apps/bc_desktop/vdi.yml index 243a902..da86698 100644 --- a/apps.awesim.org/apps/bc_desktop/vdi.yml +++ b/apps.awesim.org/apps/bc_desktop/vdi.yml @@ -31,7 +31,7 @@ attributes: - "owens" - "pitzer" - ["ascend", "ascend-login" ] - - ["cardinal", "cardinal-login" ] + - "cardinal" desktop: widget: select label: "Desktop environment" @@ -41,7 +41,6 @@ attributes: - [ "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 diff --git a/ondemand.osc.edu/apps/bc_desktop/submit/vdi.yml.erb b/ondemand.osc.edu/apps/bc_desktop/submit/vdi.yml.erb index eda8a55..59fbeb1 100644 --- a/ondemand.osc.edu/apps/bc_desktop/submit/vdi.yml.erb +++ b/ondemand.osc.edu/apps/bc_desktop/submit/vdi.yml.erb @@ -4,7 +4,6 @@ container_lookup = { 'ascend-login' => '/apps/project/ondemand/singularity/mate-rhel8/mate-rhel8.sif', - 'cardinal-login' => '/apps/project/ondemand/lightdesktop_base/rhel9/rhel9.sif' } -%> --- @@ -21,7 +20,7 @@ batch_connect: export SLURM_EXPORT_ENV=ALL script: native: - <%- if ['ascend-login', 'cardinal-login'].include?(cluster) -%> + <%- if ['ascend-login'].include?(cluster) -%> singularity_container: "<%= container_lookup[cluster] %>" <%- else -%> <%- args.each do |arg| -%> diff --git a/ondemand.osc.edu/apps/bc_desktop/vdi.yml b/ondemand.osc.edu/apps/bc_desktop/vdi.yml index 243a902..da86698 100644 --- a/ondemand.osc.edu/apps/bc_desktop/vdi.yml +++ b/ondemand.osc.edu/apps/bc_desktop/vdi.yml @@ -31,7 +31,7 @@ attributes: - "owens" - "pitzer" - ["ascend", "ascend-login" ] - - ["cardinal", "cardinal-login" ] + - "cardinal" desktop: widget: select label: "Desktop environment" @@ -41,7 +41,6 @@ attributes: - [ "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