From 0ead7d6fd1a139d59ae4e3de36ff901f926c5f07 Mon Sep 17 00:00:00 2001
From: HazelGrant <hrandquist@osc.edu>
Date: Tue, 30 Apr 2024 13:39:08 -0400
Subject: [PATCH] Adds cardinal cluster

---
 form.yml.erb           | 29 +++--------------------------
 submit.yml.erb         |  2 +-
 template/script.sh.erb |  2 +-
 3 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/form.yml.erb b/form.yml.erb
index 08d98f9..34664a7 100644
--- a/form.yml.erb
+++ b/form.yml.erb
@@ -11,6 +11,7 @@ cluster:
   - "kubernetes"
   - "kubernetes-test"
   - "kubernetes-dev"
+  - "cardinal"
 form:
   - account
   - mode
@@ -18,7 +19,7 @@ form:
   - node_type
   - cuda_version
   - num_cores
-  - version
+  - auto_modules_app_jupyter
   - bc_email_on_started
   - classroom
 attributes:
@@ -305,28 +306,4 @@ attributes:
           data-option-for-cluster-pitzer: false,
           data-option-for-cluster-ascend: false,
         ]
-  version:
-    widget: "select"
-    label: "JupyterLab Version"
-    options:
-      - [ 
-          "3.1",  "app_jupyter/3.1.18",
-          data-option-for-cluster-owens: false, 
-        ]
-      - [ 
-          "3.0",  "app_jupyter/3.0.17", 
-          data-option-for-cluster-ascend: false,
-        ]
-      - [ 
-          "2.3",  "app_jupyter/2.3.2", 
-          data-option-for-cluster-ascend: false,
-        ]
-      - [ 
-          "2.2",  "app_jupyter/2.2.10",
-          data-option-for-cluster-ascend: false,
-        ]
-      - [ 
-          "1.2",  "app_jupyter/1.2.21", 
-          data-option-for-cluster-ascend: false,
-        ]
-  classroom: 0
+  classroom: 0
\ No newline at end of file
diff --git a/submit.yml.erb b/submit.yml.erb
index d340bfa..8149d9d 100644
--- a/submit.yml.erb
+++ b/submit.yml.erb
@@ -33,7 +33,7 @@
               end
 
 -%>
-<% if cluster =~ /owens|pitzer|ascend/ -%>
+<% if cluster =~ /owens|pitzer|ascend|cardinal/ -%>
 ---
 batch_connect:
   template: "basic"
diff --git a/template/script.sh.erb b/template/script.sh.erb
index 3c1dbc1..f2014f1 100755
--- a/template/script.sh.erb
+++ b/template/script.sh.erb
@@ -23,7 +23,7 @@ module load <%= context.cuda_version %>
 cd "${NOTEBOOK_ROOT}"
 
 # Setup Jupyter environment
-module load project/ondemand <%= context.version %>
+module load project/ondemand <%= context.auto_modules_app_jupyter %>
 
 module list
 export JUPYTER_PATH="${PWD}/share/jupyter:${OSC_JUPYTER_PATH}"