Use NodeJS 18 from DNF module instead of NodeSource

theforeman · Jun 27, 2024 · 3070a21 · 3070a21
1 parent 8bd5ba9
commit 3070a21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/puppet/Puppetfile b/puppet/Puppetfile
@@ -13,7 +13,7 @@ mod 'puppet/extlib', '7.0.0'
 mod 'puppet/jenkins', '5.0.0'
 mod 'puppet/letsencrypt', '11.0.0'
 mod 'puppet/mosquitto', '2.1.0'
-mod 'puppet/nodejs', '10.0.0'
+mod 'puppet/nodejs', '11.0.0'
 mod 'puppet/pbuilder', '2.0.0'
 mod 'puppet/redis', '11.0.0'
 mod 'puppet/selinux', '4.1.0'

diff --git a/puppet/modules/jenkins_node/manifests/unittests.pp b/puppet/modules/jenkins_node/manifests/unittests.pp
@@ -70,12 +70,11 @@
   stdlib::ensure_packages(['python3-virtualenv'])
 
   # nodejs/npm for JavaScript tests
-  if $facts['os']['family'] == 'RedHat' {
-    $nodejs_version = $facts['os']['release']['major'] ? { '8' => '14', default => '18' }
+  if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '9' {
     class { 'nodejs':
-      repo_url_suffix       => "${nodejs_version}.x",
-      nodejs_package_ensure => latest,
-      npm_package_name      => false,
+      repo_version     => '18',
+      repo_class       => 'nodejs::repo::dnfmodule',
+      npm_package_name => false,
     } -> Package <| provider == 'npm' |>
 
     package { 'bower':