Add support for the cardinal cluster. (#20)

add support for cardinal cluster while also updating to use auto_accounts and auto_modules_paraview.

.gitlab-ci.yml

@@ -22,7 +22,7 @@ rpm-build:
     - ./tmp/ondemand-packaging/bin/ood_packaging -w $CI_PROJECT_DIR/tmp/work -o $CI_PROJECT_DIR/tmp/output -V $CI_COMMIT_TAG -T $CI_PROJECT_DIR
   parallel:
     matrix:
-      - OOD_PACKAGING_DIST: [el7, el8]
+      - OOD_PACKAGING_DIST: [el8]
   artifacts:
     paths:
       - tmp/output

form.yml

@@ -0,0 +1,12 @@
+---
+cluster:
+  - "owens"
+  - "cardinal"
+form:
+  - auto_modules_paraview
+  - auto_accounts
+  - bc_num_hours
+  - bc_vnc_resolution
+attributes:
+  bc_vnc_resolution:
+    required: true

submit.yml.erb

@@ -1,11 +1,14 @@
 <%-
-  args = [ "--partition", "quick", "--nodes", "1", "--ntasks-per-node", "1" ]
+  args =  if cluster == 'owens'
+            [ "--partition", "quick", "--nodes", "1", "--ntasks-per-node", "1" ]
+          else
+            ["--gres", "vis", "--nodes", "1", "--ntasks-per-node", "1", "--gpus", "1"]
+          end
 -%>
 ---
 batch_connect:
   template: vnc
 script:
-  accounting_id: "<%= account %>"
   native:
     <%- args.each do |arg| -%>
     - "<%= arg %>"

template/script.sh.erb

@@ -9,19 +9,25 @@ cd "${HOME}"
 #
 # Launch Xfce Window Manager and Panel
 #
+export SEND_256_COLORS_TO_REMOTE=1
+export XDG_CONFIG_HOME="<%= session.staged_root.join("config") %>"
+export XDG_DATA_HOME="<%= session.staged_root.join("share") %>"
+export XDG_CACHE_HOME="$(mktemp -d)"
+export $(dbus-launch)
 
-(
-  module restore
-  export XDG_CONFIG_HOME="<%= session.staged_root.join("config") %>"
-  export XDG_DATA_HOME="<%= session.staged_root.join("share") %>"
-  export XDG_CACHE_HOME="$(mktemp -d)"
-  export $(dbus-launch)
+source /etc/os-release
 
+if [[ "$VERSION_ID" < "9" ]]; then
   xfwm4 --compositor=off --daemon --sm-client-disable
   xsetroot -solid "#D3D3D3"
   xfsettingsd --sm-client-disable
-  xfce4-panel --sm-client-disable
-) &
+  xfce4-panel --sm-client-disable &
+else
+  xfwm4 --compositor=off --sm-client-disable &
+  xsetroot -solid "#D3D3D3"
+  xfsettingsd --sm-client-disable &
+  xfce4-panel --sm-client-disable &
+fi
 
 # Restore the module environment to avoid conflicts
 module restore
@@ -31,7 +37,11 @@ module restore
 #
 
 # Load the required environment
-module load xalt/latest intel/16.0.3 virtualgl <%= context.version %>
+<%- if context.cluster == 'owens' -%>
+module load xalt/latest intel/16.0.3 virtualgl <%= context.auto_modules_paraview %>
+<%- else -%>
+module load xalt/latest virtualgl <%= context.auto_modules_paraview %>
+<%- end -%>
 
 # Output debug info
 module list