first commit to update defaults and tests for 3.1

OSC · Feb 20, 2024 · 4b07782 · 4b07782
1 parent 3b0f6cc
commit 4b07782
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/defaults/main/install.yml b/defaults/main/install.yml
@@ -17,8 +17,8 @@ apache_etc_dir: "/etc/{{ apache_service_name }}"
 apache_conf_dir: "{{ apache_etc_dir }}/conf.d"
 apache_log_dir: "/var/log/{{ apache_service_name }}"
 
-rpm_repo_url: "https://yum.osc.edu/ondemand/3.0/ondemand-release-web-3.0-1.noarch.rpm"
-apt_repo_url: "https://apt.osc.edu/ondemand/3.0/ondemand-release-web_3.0.0_all.deb"
+rpm_repo_url: "https://yum.osc.edu/ondemand/3.1/ondemand-release-web-3.1-1.{{ el_distro }}.noarch.rpm"
+apt_repo_url: "https://apt.osc.edu/ondemand/3.1/ondemand-release-web_3.1.0_all.deb"
 
 rpm_repo_key: "https://yum.osc.edu/ondemand/RPM-GPG-KEY-ondemand"
 deb_repo_key: "https://apt.osc.edu/ondemand/DEB-GPG-KEY-ondemand"
@@ -40,5 +40,5 @@ ondemand_dex_package: ondemand-dex # behaviour as for ondemand_package
 
 # needed for testing. no reason to change these in production.
 disable_htcacheclean: false
-nodejs_version: 14
-ruby_version: 3.0
+nodejs_version: 18
+ruby_version: 3.1
diff --git a/molecule/upgrade/vars/prepare.yml b/molecule/upgrade/vars/prepare.yml
@@ -1,6 +1,6 @@
-ondemand_package: "ondemand{% if ansible_os_family == 'RedHat' %}-{% else %}={% endif %}2.0.28"
+ondemand_package: "ondemand{% if ansible_os_family == 'RedHat' %}-{% else %}={% endif %}3.0.3"
 disable_htcacheclean: true
 nodejs_version: 12
 ruby_version: 2.7
-apt_repo_url: "https://apt.osc.edu/ondemand/2.0/ondemand-release-web_2.0.0_all.deb"
-rpm_repo_url: "https://yum.osc.edu/ondemand/2.0/ondemand-release-web-2.0-1.noarch.rpm"
+apt_repo_url: "https://apt.osc.edu/ondemand/3.0/ondemand-release-web_3.0.0_all.deb"
+rpm_repo_url: "https://yum.osc.edu/ondemand/3.0/ondemand-release-web-3.0-1.noarch.rpm"
diff --git a/tasks/install-package.yml b/tasks/install-package.yml
@@ -1,3 +1,8 @@
+- name: Set el_distro when OS is RHEL
+  set_fact:
+    el_distro: el{{ ansible_distribution_major_version }}
+  when: ansible_os_family == "RedHat"
+
 - name: Install the rpm repo's key
   ansible.builtin.rpm_key:
     state: present

diff --git a/vars/RedHat/9.yml b/vars/RedHat/9.yml
@@ -13,5 +13,7 @@ locations_ini: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passen
 
 additional_rpm_installs:
   - lua-posix
+  - @nodejs:{{ nodejs_version }}
+  - @ruby:{{ ruby_version }}
 
 rpm_repo_key: https://yum.osc.edu/ondemand/RPM-GPG-KEY-ondemand-SHA512
diff --git a/vars/Rocky/9.yml b/vars/Rocky/9.yml
@@ -12,5 +12,7 @@ locations_ini: "/opt/ood/ondemand/root/usr/share/ruby/vendor_ruby/phusion_passen
 
 additional_rpm_installs:
   - lua-posix
+  - '@nodejs:{{ nodejs_version }}'
+  - '@ruby:{{ ruby_version }}'
 
 rpm_repo_key: https://yum.osc.edu/ondemand/RPM-GPG-KEY-ondemand-SHA512