support el9 and remove xalt (#40)

* support el9

* remove xalt

Author: johrstrom

.gitlab-ci.yml

@@ -2,7 +2,7 @@ variables:
   # older versions of git have issues fetching.
   GIT_STRATEGY: clone
   OOD_PACKAGING_DEBUG: 'true'
-  OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec
+  OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand-sha512.sec
   OOD_PACKAGING_GPG_PASSPHRASE: /systems/osc_certs/gpg/ondemand/.gpgpass
 
 before_script:
@@ -23,6 +23,8 @@ rpm-build:
   parallel:
     matrix:
       - OOD_PACKAGING_DIST: [el8]
+        OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand.sec
+      - OOD_PACKAGING_DIST: [el9]
   artifacts:
     paths:
       - tmp/output

template/before.sh.erb

@@ -138,7 +138,6 @@ module purge
 # Load the runtime environment
 runtime_env() {
   module purge
-  module load xalt/latest
   <%- unless ['cardinal', 'ascend'].include?(context.cluster) -%>
   module load python/3.6-conda5.2 spark/<%= context.spark_version %>
   <%- else -%>

template/script.sh.erb

@@ -43,9 +43,9 @@ echo "TTT - $(date)"
 
 # Setup Jupyter Notebook environment
 <%- if ['cardinal', 'ascend'].include?(context.cluster) -%>
-module load project/ondemand xalt/latest <%= context.version %>
+module load project/ondemand <%= context.version %>
 <%- else -%>
-module load ondemand/project xalt/latest <%= context.version %>
+module load ondemand/project <%= context.version %>
 <%- end -%>
 module load spark/<%= context.spark_version %>
 module list