NodeJS 20 for Amazon 2023

OSC · Nov 10, 2024 · 145796d · 145796d
1 parent 432431d
commit 145796d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ gem 'rake'
 gem 'dotenv', '~> 2.1'
 
 group :package do
-  gem 'ood_packaging', '~> 0.16.0'
+  gem 'ood_packaging', '~> 0.16.1'
 end
 
 group :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -96,7 +96,7 @@ GEM
     oga (3.3)
       ast
       ruby-ll (~> 2.1)
-    ood_packaging (0.16.0)
+    ood_packaging (0.16.1)
       rake (~> 13.0.1)
     open_uri_redirections (0.2.1)
     parallel (1.21.0)
@@ -177,7 +177,7 @@ DEPENDENCIES
   beaker-docker (~> 1.4.0)
   beaker-rspec
   dotenv (~> 2.1)
-  ood_packaging (~> 0.16.0)
+  ood_packaging (~> 0.16.1)
   rake
   rspec
   rubocop

diff --git a/packaging/rpm/ondemand.spec b/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}.0
+%define runtime_version %{major_version}.%{minor_version}.1
 %define runtime_release 1
 %define runtime_version_full %{runtime_version}-%{runtime_release}%{?dist}
 %define selinux_policy_ver %(rpm --qf "%%{version}" -q selinux-policy)

diff --git a/spec/e2e/e2e_helper.rb b/spec/e2e/e2e_helper.rb
@@ -183,6 +183,10 @@ def install_ondemand
     on hosts, 'apt-get update'
     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'
+  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"
   on hosts, 'systemctl daemon-reload'