Prep OnDemand 4.1 dependencies (#4646)

* Prep OnDemand 4.1 dependencies
* Upgrade NodeJS from 20 to 22
* Upgrade Passenger from 6.0.23 to 6.1.0
* Upgrade NGINX from 1.23.1 to 1.23.3
* Upgrade Dex from 2.41.1 to 2.44.0

* Force Python 3.12 for EL8 to avoid errors with node-gyp

* Runtime only requires python3

Author: treydock

.github/workflows/tests.yml

@@ -137,7 +137,7 @@ jobs:
           - x86_64
           - aarch64
           - ppc64le
-        version: ["4.0"]
+        version: ["4.1"]
         exclude:
           # Amazon 2023 on aarch64 is very slow and will time out
           - dist: amzn2023

.gitlab-ci.yml

@@ -9,7 +9,7 @@ stages:
   - deploy
 
 variables:
-  OOD_BUILD_REPO: '4.0'
+  OOD_BUILD_REPO: '4.1'
   GIT_STRATEGY: clone
   GIT_DEPTH: 0
   OOD_PACKAGING_DEBUG: 'true'

Gemfile

@@ -8,7 +8,7 @@ gem 'rake'
 gem 'dotenv', '~> 2.1'
 
 group :package do
-  gem 'ood_packaging', '~> 0.17.1'
+  gem 'ood_packaging', '~> 0.18.0'
 end
 
 group :test do

Gemfile.lock

@@ -53,7 +53,7 @@ GEM
       net-ssh (>= 2.6.5, < 8.0.0)
     net-ssh (7.3.0)
     net-telnet (0.2.0)
-    ood_packaging (0.17.1)
+    ood_packaging (0.18.0)
       rake (~> 13.0.1)
     parallel (1.27.0)
     parser (3.3.8.0)
@@ -137,7 +137,7 @@ DEPENDENCIES
   beaker-docker (~> 1.4.0)
   beaker-rspec
   dotenv (~> 2.1)
-  ood_packaging (~> 0.17.1)
+  ood_packaging (~> 0.18.0)
   rake
   rspec
   rubocop

packaging/deb/control

@@ -5,7 +5,7 @@ Maintainer: Ohio Supercomputer Center <[email protected]>
 Build-Depends: debhelper (>=11~), curl, build-essential,
   tzdata, libxml2-dev, libxslt-dev, pkg-config, zlib1g-dev, liblzma-dev,
   ruby, ruby-dev, libyaml-dev, libxml2,
-  nodejs (>= 20.0), nodejs (<< 21.0),
+  nodejs (>= 22.0), nodejs (<< 23.0),
   sqlite3, libsqlite3-dev, python3@EXTRA_DEPENDS@
 Standards-Version: 4.1.4
 Homepage: https://openondemand.org
@@ -15,9 +15,9 @@ Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends},
   ruby, apache2, sudo, lsof, lua-posix, tzdata, file,
-  nodejs (>= 20.0), nodejs (<< 21.0),
-  ondemand-nginx (>= 1.26.1.p6.0.23.ood4.0.3),  ondemand-nginx (<< 1.27),
-  ondemand-passenger (>= 6.0.23.ood4.0.3), ondemand-passenger (<< 6.0.24),
+  nodejs (>= 22.0), nodejs (<< 23.0),
+  ondemand-nginx (>= 1.26.3.p6.1.0.ood4.1.0),  ondemand-nginx (<< 1.27),
+  ondemand-passenger (>= 6.1.0.ood4.1.0), ondemand-passenger (<< 6.1.1),
 Recommends: rclone
 Description: Open OnDemand is an open source release of the Ohio SuperComputer Center's
   OnDemand platform to provide HPC access via a web browser, supporting web based file

packaging/rpm/ondemand.spec

@@ -5,7 +5,7 @@
 %define git_tag_minus_v %(echo %{git_tag} | sed -r 's/^v//')
 %define major_version %(echo %{git_tag_minus_v} | cut -d. -f1)
 %define minor_version %(echo %{git_tag_minus_v} | cut -d. -f2)
-%define runtime_version %{major_version}.%{minor_version}.3
+%define runtime_version %{major_version}.%{minor_version}.0
 %define runtime_release 1
 %define runtime_version_full %{runtime_version}-%{runtime_release}%{?dist}
 # Use hardcoded RHEL 9.5 for a short period while downstream RHEL clones get RHEL 9.6 release
@@ -67,7 +67,12 @@ BuildRequires:   ondemand-ruby = %{runtime_version_full}
 BuildRequires:   ondemand-nodejs = %{runtime_version_full}
 BuildRequires:   rsync
 BuildRequires:   git
+# Force Python 3.12 for EL8 as Python 3.6 does not work with node-gyp
+%if 0%{?rhel} == 8
+BuildRequires:   python3.12
+%else
 BuildRequires:   python3
+%endif
 BuildRequires:   libffi-devel
 BuildRequires:   libyaml-devel
 
@@ -79,8 +84,8 @@ Requires:        python3
 Requires:        rclone
 %endif
 Requires:        ondemand-apache = %{runtime_version_full}
-Requires:        ondemand-nginx = 1.26.1-3.p6.0.23.ood%{runtime_version}%{?dist}
-Requires:        ondemand-passenger = 6.0.23-3.ood%{runtime_version}%{?dist}
+Requires:        ondemand-nginx = 1.26.3-1.p6.1.0.ood%{runtime_version}%{?dist}
+Requires:        ondemand-passenger = 6.1.0-1.ood%{runtime_version}%{?dist}
 Requires:        ondemand-ruby = %{runtime_version_full}
 Requires:        ondemand-nodejs = %{runtime_version_full}
 Requires:        ondemand-runtime = %{runtime_version_full}

spec/e2e/e2e_helper.rb

@@ -120,7 +120,7 @@ def bootstrap_repos
   when 'redhat'
     repos << 'epel-release'
     on hosts, 'dnf -y module enable ruby:3.3'
-    on hosts, 'dnf -y module enable nodejs:20'
+    on hosts, 'dnf -y module enable nodejs:22'
   when 'ubuntu', 'debian'
     on hosts, 'apt-get update'
   end
@@ -161,7 +161,7 @@ def ondemand_repo
 end
 
 def build_repo_version
-  ENV['OOD_BUILD_REPO'] || '4.0'
+  ENV['OOD_BUILD_REPO'] || '4.1'
 end
 
 def install_ondemand
@@ -182,8 +182,8 @@ def install_ondemand
     install_packages(['ondemand', 'ondemand-dex'])
   end
   if host_inventory['platform'] == 'amazon'
-    on hosts, 'alternatives --install /usr/bin/node node /usr/bin/node-20 1'
-    on hosts, 'alternatives --install /usr/bin/npm npm /usr/bin/npm-20 1'
+    on hosts, 'alternatives --install /usr/bin/node node /usr/bin/node-22 1'
+    on hosts, 'alternatives --install /usr/bin/npm npm /usr/bin/npm-22 1'
   end
   # Avoid 'update_ood_portal --rpm' so that --insecure can be used
   on hosts, "sed -i 's|--rpm|--rpm --insecure|g' /etc/systemd/system/#{apache_service}.service.d/ood-portal.conf"