Bootstrap OnDemand 4.0 (#284)

* Bootstrap OnDemand 4.0
* Bump runtime for passenger
* Update release manifest
* Ensure build repo uses 4.0, fix passenger changelog for debian builds
* Fix Ruby and NodeJS version requirements in ondemand-runtime
* Upgrade Passenger to 6.0.23 and NGINX to 1.26.1
* Add ondemand-dex 2.41.1 to release manifest

.gitlab-ci.yml

@@ -12,7 +12,7 @@ stages:
 variables:
   GIT_STRATEGY: clone
   GIT_DEPTH: 0
-  OOD_BUILD_REPO: '3.1'
+  OOD_BUILD_REPO: '4.0'
   OOD_PACKAGING_DEBUG: 'true'
   OOD_PACKAGING_GPG_PRIVATE_KEY: /systems/osc_certs/gpg/ondemand/ondemand-sha512.sec
   OOD_PACKAGING_GPG_PASSPHRASE: /systems/osc_certs/gpg/ondemand/.gpgpass

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ood_packaging (0.15.2)
+    ood_packaging (0.16.0)
       rake (~> 13.0.1)
 
 GEM

lib/ood_packaging/utils.rb

@@ -55,19 +55,19 @@ def template_file(filename)
   end
 
   def ondemand_repo_version
-    '3.1'
+    '4.0'
   end
 
   def ondemand_rpm_repo_baseurl
     "https://yum.osc.edu/ondemand/build/#{ondemand_repo_version}/web/#{dist}/\\$basearch/"
   end
 
   def ruby_version
-    '3.1'
+    '3.3'
   end
 
   def nodejs_version
-    '18'
+    '20'
   end
 
   def ctr_scripts_dir

lib/ood_packaging/version.rb

@@ -2,25 +2,25 @@
 
 # Version code for OodPackaging
 module OodPackaging
-  VERSION = '0.15.2'
+  VERSION = '0.16.0'
   PACKAGE_VERSION = {
     'ondemand-release'        => {
-      '(ubuntu|debian)' => '3.1.2',
-      'default'         => '3.1'
+      '(ubuntu|debian)' => '4.0.0',
+      'default'         => '4.0'
     },
     'ondemand-release-latest' => {
       '(ubuntu|debian)' => '4',
       'default'         => '1-8'
     },
-    'ondemand-runtime'        => '3.1.6',
+    'ondemand-runtime'        => '4.0.0',
     'scl-utils'               => '2.0.3',
-    'passenger'               => '6.0.20',
+    'passenger'               => '6.0.23',
     'cjose'                   => '0.6.1',
     'mod_auth_openidc'        => '2.4.14.1',
     'ondemand_exporter'       => '0.10.0',
     'ondemand-compute'        => {
-      '(ubuntu|debian)' => '3.1.0',
-      'default'         => '3.1.0'
+      '(ubuntu|debian)' => '4.0.0',
+      'default'         => '4.0.0'
     },
     'python-websockify'       => '0.11.0',
     'turbovnc'                => '3.1.1'

packages/ondemand-runtime/rpm/ondemand-runtime.spec

@@ -8,7 +8,7 @@
 %global ruby ruby
 %global nodejs nodejs
 %global apache httpd
-%global ruby_version 3.1
+%global ruby_version 3.3
 %endif
 %if 0%{?amzn} == 2023
 %global ruby ruby3.2
@@ -58,7 +58,7 @@ packages depending on %{scl} Software Collection.
 %package -n ondemand-ruby
 Summary: Meta package for pulling in SCL Ruby %{ruby}
 %if 0%{?rhel} >= 8
-Requires: %{ruby} >= 3.1, %{ruby} < 3.2
+Requires: %{ruby} >= 3.3, %{ruby} < 3.4
 Requires: rubygem-rake
 Requires: rubygem-bundler >= 2.1
 Requires: ruby-devel
@@ -87,11 +87,11 @@ Meta package for pulling in SCL Ruby %{ruby}
 %package -n ondemand-nodejs
 Summary: Meta package for pulling in SCL nodejs %{nodejs}
 %if 0%{?rhel} == 9
-Requires: %{nodejs} >= 1:18.0, %{nodejs} < 1:19.0
+Requires: %{nodejs} >= 1:20.0, %{nodejs} < 1:21.0
 Requires: npm
 %endif
 %if 0%{?rhel} == 8
-Requires: %{nodejs} >= 1:18.0, %{nodejs} < 1:19.0
+Requires: %{nodejs} >= 1:20.0, %{nodejs} < 1:21.0
 Requires: npm
 %endif
 %if 0%{?amzn} == 2023

packages/passenger/deb/debian/changelog

@@ -1,4 +1,4 @@
-passenger (6.0.20.ood3.1) UNRELEASED; urgency=low
+passenger (6.0.23.ood4.0) UNRELEASED; urgency=low
 
   * Initial release. Closes: #nnnn
     <nnnn is the bug number of your ITP>

packages/passenger/deb/debian/ondemand-nginx.changelog

@@ -1,4 +1,4 @@
-passenger (1.24.0.p6.0.20.ood3.1) UNRELEASED; urgency=low
+passenger (1.26.1.p6.0.23.ood4.0) UNRELEASED; urgency=low
 
   * Initial release. Closes: #nnnn
     <nnnn is the bug number of your ITP>

packages/passenger/deb/debian/rules

@@ -7,7 +7,7 @@ export PREFIX = /opt/ood/ondemand/root
 export DEV_DESTDIR = $(CURDIR)/debian/ondemand-passenger-dev
 export DOC_DESTDIR = $(CURDIR)/debian/ondemand-passenger-doc
 export RUBY_LIBDIR = $(PREFIX)/usr/share/ruby/vendor_ruby
-export NGINX_VERSION = 1.24.0
+export NGINX_VERSION = 1.26.1
 export NGINX_DESTDIR = $(CURDIR)/debian/ondemand-nginx
 export NGINX_DATADIR = $(PREFIX)/usr/share/nginx
 export NGINX_CONFDIR = $(PREFIX)/etc/nginx

packages/passenger/rpm/passenger.spec

@@ -2,11 +2,11 @@
 %define pkg_name passenger
 %scl_package passenger
 %define passenger_version %{package_version}
-%define nginx_version 1.24.0
+%define nginx_version 1.26.1
 %define release_version %{package_release}
 %define ngix_release_version 1
 
-%define runtime_version 3.1.6
+%define runtime_version 4.0.0
 
 %global  nginx_user          %{?scl_prefix}nginx
 %global  nginx_group         %{nginx_user}
@@ -17,7 +17,7 @@
 %global  nginx_logdir        %{_root_localstatedir}/log/%{?scl_prefix}nginx
 %global  nginx_webroot       %{nginx_datadir}/html
 
-%global bundled_boost_version 1.83.0
+%global bundled_boost_version 1.85.0
 %global apache_module_package_name mod_passenger
 %global ruby_vendorlibdir %{_datadir}/ruby/vendor_ruby
 %global ruby_vendorarchdir %{_libdir}/ruby/vendor_ruby

release-manifest.yaml

@@ -1,6 +1,6 @@
-major: '3.1'
-full: '3.1.9'
-runtime: '3.1.6'
+major: '4.0'
+full: '4.0.0'
+runtime: '4.0.0'
 
 # release
 ondemand-release:
@@ -40,9 +40,9 @@ ondemand-nginx:
     - ondemand-nginx
     - ondemand-nginx-debuginfo
   versions:
-    - 1.24.0-1.p6.0.20.ood{runtime}
+    - 1.26.1-1.p6.0.23.ood{runtime}
     # deb package
-    - 1.24.0.p6.0.20.ood{major}
+    - 1.26.1.p6.0.23.ood{major}
 ondemand-passenger:
   packages:
     - ondemand-passenger
@@ -51,9 +51,9 @@ ondemand-passenger:
     - ondemand-passenger-dev
     - ondemand-passenger-doc
   versions:
-    - 6.0.20-1.ood{runtime}
+    - 6.0.23-1.ood{runtime}
     # deb package
-    - 6.0.20.ood{major}
+    - 6.0.23.ood{major}
 ondemand-runtime:
   packages:
     - ondemand-apache
@@ -84,9 +84,9 @@ scl-utils:
   versions:
     - 2.0.3-1
 ondemand-dex:
-  - 2.36.0-1
+  - 2.41.1-1
   # deb package
-  - 2.36.0
+  - 2.41.1
 ondemand_exporter:
   - 0.10.0-1