test against 4.1

.github/workflows/tests.yml

@@ -27,17 +27,23 @@ jobs:
       max-parallel: 4
       matrix:
         image:
-          - 'centos/centos:stream8'
           - 'rockylinux:8'
           - 'rockylinux:9'
+          - 'rockylinux/rockylinux:10'
           - 'almalinux:8'
           - 'almalinux:9'
-          - 'ubuntu:20.04'
+          - 'almalinux:10'
           - 'ubuntu:22.04'
           - 'ubuntu:24.04'
         scenario:
           - 'default'
           - 'upgrade'
+        exclude:
+          # 4.0 did not support el:10
+          - scenario: upgrade
+            image: 'rockylinux/rockylinux:10'
+          - scenario: upgrade
+            image: 'almalinux:10'
 
     steps:
       - name: checkout

defaults/main/install.yml

@@ -49,7 +49,7 @@ ondemand_selinux_package: ondemand-selinux # behaviour as for ondemand_package
 
 # needed for testing. no reason to change these in production.
 disable_htcacheclean: false
-nodejs_version: 20
+nodejs_version: 22
 ruby_version: 3.3
 
 ood_base_apache_dir: "/var/www/ood"

molecule/default/prepare.yml

@@ -15,6 +15,14 @@
       - ca-certificates
       - systemd
       - git
+
+    - name: Install extra packages (EL10)
+      ansible.builtin.package:
+        name: "{{ item }}"
+        state: latest
+      loop:
+      - gnupg2
+      when:  ansible_os_family == "RedHat" and ansible_distribution_major_version == '10'
 
     - name: Create secondary group
       ansible.builtin.group:

molecule/default/vars/install.yml

@@ -1,4 +1,4 @@
 disable_htcacheclean: true
 
-apt_repo_url: "https://apt.osc.edu/ondemand/staging/4.0/ondemand-release-web_4.0.0-{{ deb_distro }}_all.deb"
-rpm_repo_url: "https://yum.osc.edu/ondemand/staging/4.0/ondemand-release-web-4.0-1.{{ el_distro }}.noarch.rpm"
+apt_repo_url: "https://apt.osc.edu/ondemand/4.1/ondemand-release-web_4.1.0-{{ deb_distro }}_all.deb"
+rpm_repo_url: "https://yum.osc.edu/ondemand/4.1/ondemand-release-web-4.1-1.{{ el_distro }}.noarch.rpm"

molecule/upgrade/prepare.yml

@@ -16,14 +16,22 @@
       - systemd
       - git
 
+    - name: Install extra packages (EL10)
+      ansible.builtin.package:
+        name: "{{ item }}"
+        state: latest
+      loop:
+      - gnupg2
+      when:  ansible_os_family == "RedHat" and ansible_distribution_major_version == '10'
+
 - name: Install previous version
   hosts: all
 
   pre_tasks:
     - name: Set dependency versions on el8
       set_fact:
-        ruby_version: 3.1
-        nodejs_version: 18
+        ruby_version: 3.3
+        nodejs_version: 20
       when: ansible_os_family == "RedHat" and ansible_distribution_major_version >= '8'
 
     - name: Use default versions on el9

molecule/upgrade/vars/converge.yml

@@ -1,5 +1,4 @@
 ondemand_package: 'latest'
 
-# test against staging to catch any issues upgrading
-apt_repo_url: "https://apt.osc.edu/ondemand/staging/4.0/ondemand-release-web_4.0.0-{{ deb_distro }}_all.deb"
-rpm_repo_url: "https://yum.osc.edu/ondemand/staging/4.0/ondemand-release-web-4.0-1.{{ el_distro }}.noarch.rpm"
+apt_repo_url: "https://apt.osc.edu/ondemand/4.1/ondemand-release-web_4.1.0-{{ deb_distro }}_all.deb"
+rpm_repo_url: "https://yum.osc.edu/ondemand/4.1/ondemand-release-web-4.1-1.{{ el_distro }}.noarch.rpm"

molecule/upgrade/vars/prepare.yml

@@ -1,6 +1,5 @@
-ondemand_package: "ondemand{% if ansible_os_family == 'RedHat' %}-{% else %}={% endif %}3.1.13"
+ondemand_package: "ondemand{% if ansible_os_family == 'RedHat' %}-{% else %}={% endif %}4.0.8"
 disable_htcacheclean: true
 
-# test against staging to catch any issues upgrading
-apt_repo_url: "https://apt.osc.edu/ondemand/staging/3.1/ondemand-release-web_3.1.2-{{ deb_distro }}_all.deb"
-rpm_repo_url: "https://yum.osc.edu/ondemand/staging/3.1/ondemand-release-web-3.1-1.{{ el_distro }}.noarch.rpm"
+apt_repo_url: "https://apt.osc.edu/ondemand/4.0/ondemand-release-web_4.0.0-{{ deb_distro }}_all.deb"
+rpm_repo_url: "https://yum.osc.edu/ondemand/4.0/ondemand-release-web-4.0-1.{{ el_distro }}.noarch.rpm"

molecule/upgrade/verify.yml

@@ -58,7 +58,7 @@
   - name: Verify OOD version
     ansible.builtin.shell: |
       set -o pipefail
-      grep -P '4.0.(\d)*' /opt/ood/VERSION
+      grep -P '4.1.(\d)*' /opt/ood/VERSION
     args:
       executable: /bin/bash
     changed_when: false

tasks/configure.yml

@@ -65,7 +65,7 @@
     src: "{{ apache_etc_dir }}/mods-available/ssl.load"
     dest: "{{ apache_etc_dir }}/mods-enabled/ssl.load"
     state: link
-  when: ansible_os_family == "Debian" and ssl is defined
+  when: ansible_os_family == "Debian" and (ssl is defined or ssl_proxy is defined)
 
 - name: Enable Debian oidc mod
   ansible.builtin.file:

tasks/install-package.yml

@@ -55,6 +55,9 @@
   when: ansible_os_family == "RedHat" and ansible_distribution_major_version == '8'
   loop:
     - "{{ additional_rpm_installs }}"
+  tags:
+    # not sure why this is not idempotent all of the sudden, but it is in molecule tests
+    - molecule-idempotence-notest
 
 - name: Install additional packages
   ansible.builtin.package:

vars/AlmaLinux/10.yml

@@ -0,0 +1,18 @@
+---
+os_dependencies:
+- redhat-rpm-config
+- libnsl
+
+apache_oidc_mod_package:  mod_auth_openidc
+
+nginx_root: "/opt/rh/ondemand/root"
+nginx_bin: "{{ nginx_root }}/sbin/nginx"
+nginx_mime_types: "{{ nginx_root }}/etc/nginx/mime.types"
+locations_ini: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini"
+
+additional_rpm_installs:
+  - lua-posix
+  - 'nodejs'
+  - 'ruby'
+
+rpm_repo_key: https://yum.osc.edu/ondemand/RPM-GPG-KEY-ondemand-SHA512

vars/AlmaLinux/8.yml

@@ -10,6 +10,8 @@ nginx_bin: "{{ nginx_root }}/sbin/nginx"
 nginx_mime_types: "{{ nginx_root }}/etc/nginx/mime.types"
 locations_ini: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini"
 
+nodejs_version: '22/common'
+
 additional_rpm_installs:
   - lua-posix
   - "@ruby:{{ ruby_version }}"

vars/RedHat/10.yml

@@ -0,0 +1,19 @@
+---
+os_dependencies:
+- redhat-rpm-config
+- libnsl
+- lua-posix
+
+apache_oidc_mod_package:  mod_auth_openidc
+
+nginx_root: "/opt/rh/ondemand/root"
+nginx_bin: "{{ nginx_root }}/sbin/nginx"
+nginx_mime_types: "{{ nginx_root }}/etc/nginx/mime.types"
+locations_ini: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini"
+
+additional_rpm_installs:
+  - lua-posix
+  - 'nodejs'
+  - 'ruby'
+
+rpm_repo_key: https://yum.osc.edu/ondemand/RPM-GPG-KEY-ondemand-SHA512

vars/RedHat/8.yml

@@ -11,6 +11,8 @@ nginx_bin: "{{ nginx_root }}/sbin/nginx"
 nginx_mime_types: "{{ nginx_root }}/etc/nginx/mime.types"
 locations_ini: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini"
 
+nodejs_version: '22/common'
+
 additional_rpm_installs:
   - lua-posix
   - "@ruby:{{ ruby_version }}"

vars/Rocky/10.yml

@@ -0,0 +1,18 @@
+---
+os_dependencies:
+- redhat-rpm-config
+- libnsl
+
+apache_oidc_mod_package:  mod_auth_openidc
+
+nginx_root: "/opt/rh/ondemand/root"
+nginx_bin: "{{ nginx_root }}/sbin/nginx"
+nginx_mime_types: "{{ nginx_root }}/etc/nginx/mime.types"
+locations_ini: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini"
+
+additional_rpm_installs:
+  - lua-posix
+  - 'nodejs'
+  - 'ruby'
+
+rpm_repo_key: https://yum.osc.edu/ondemand/RPM-GPG-KEY-ondemand-SHA512

vars/Rocky/8.yml

@@ -10,6 +10,8 @@ nginx_bin: "{{ nginx_root }}/sbin/nginx"
 nginx_mime_types: "{{ nginx_root }}/etc/nginx/mime.types"
 locations_ini: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini"
 
+nodejs_version: '22/common'
+
 additional_rpm_installs:
   - lua-posix
   - "@ruby:{{ ruby_version }}"