Merge remote-tracking branch 'upstream/master'

Author: dsajdak

ondemand/README.md

@@ -1004,6 +1004,26 @@ sudo sacctmgr add user hpcadmin account=sfoster
 sudo sacctmgr modify user where user=hpcadmin set defaultaccount=staff
 ```
 
+### Hiding form options
+
+Lastly, we can use this feature to hide and show other form fields. This can be useful when
+some options are avaialbe for somethings. For example you may want to show CUDA versions as
+a form option for GPU nodes, but not for other nodes.
+
+Add the `data-hide-bc-account` line to our `debug` form option and we'll start hiding that
+field when the debug option is chosen.
+
+```yaml
+      - [
+          "Debug", "debug",
+          data-min-memory: 400,
+          data-max-memory: 600,
+
+          data-set-bc-account: 'staff',
+          data-hide-bc-account: true,       # hide the bc_account field when this is chosen.
+        ]
+```
+
 ## Passenger app tutorial
 
 Access OnDemand dashboard https://localhost:3443

xdmod/install.sh

@@ -21,12 +21,10 @@ ARCHTYPE=`uname -m`
 
 dnf install -y \
     expect \
-    python2-pip \
+    python3-pexpect \
     php-pear \
     php-devel
 
-pip2 install pexpect==4.4.0
-
 #------------------------
 # Open XDMoD Installation
 #
@@ -39,10 +37,10 @@ pip2 install pexpect==4.4.0
 # be installed in the same container.  In a production deployment they may be installed
 # on separate hosts.
 #------------------------
-dnf install -y https://github.com/ubccr/xdmod/releases/download/v10.0.0-beta4-el8/xdmod-10.0.0-1.4.beta4.el8.noarch.rpm \
+dnf install -y https://github.com/ubccr/xdmod/releases/download/v10.0.0-beta5-el8/xdmod-10.0.0-1.5.beta5.el8.noarch.rpm \
                https://github.com/ubccr/xdmod-ondemand/releases/download/v10.0.0/xdmod-ondemand-10.0.0-1.0.beta1.el8.noarch.rpm \
                https://github.com/ubccr/xdmod/releases/download/v10.0.0-beta4-el8/xdmod-supremm-10.0.0-1.4.beta4.el8.noarch.rpm \
-               https://github.com/ubccr/supremm/releases/download/2.0.0-beta3/supremm-2.0.0-1.0_beta3.el8.x86_64.rpm
+               https://github.com/ubccr/supremm/releases/download/2.0.0-beta3/supremm-2.0.0-1.0_beta3.el8."$ARCHTYPE".rpm
 
 #------------------------
 # The Job Performance software uses MongoDB to store the job-level performance
@@ -63,7 +61,6 @@ pecl install mongodb
 echo "extension=mongodb.so" >> /etc/php.d/40-mongodb.ini
 
 pip3 install pymongo==3.7.0 --upgrade
-pip2 install pymongo --upgrade
 
 #------------------------
 # O/S package configuration.

xdmod/scripts/supremm.py

@@ -1,12 +1,12 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 import pexpect
 import sys
 
 def main():
 
     scriptsettings = ['start', 'start', 'start', 'end', 'submit']
 
-    with open("supremm_expect_log", "w") as f:
+    with open("supremm_expect_log", "wb") as f:
         p = pexpect.spawn('supremm-setup')
         p.logfile = f