disable nodesource for bookworm, it ships with NodeJS 18 already

theforeman · Feb 29, 2024 · 29664dd · 29664dd
1 parent 339939a
commit 29664dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/puppet/modules/slave/manifests/packaging/debian.pp b/puppet/modules/slave/manifests/packaging/debian.pp
@@ -36,7 +36,8 @@
       arch       => 'amd64',
       release    => 'bookworm',
       apturl     => $debian_mirror,
-      aptcontent => "deb ${debian_mirror} bookworm main non-free contrib\ndeb-src ${debian_mirror} bullseye main non-free contrib\n";
+      aptcontent => "deb ${debian_mirror} bookworm main non-free contrib\ndeb-src ${debian_mirror} bullseye main non-free contrib\n",
+      nodesource => false;
     'focal64':
       ensure     => present,
       arch       => 'amd64',

diff --git a/puppet/spec/classes/slave_spec.rb b/puppet/spec/classes/slave_spec.rb
@@ -31,6 +31,8 @@
           it { is_expected.to contain_file('/etc/pbuilder/bullseye64/hooks/F66-add-nodesource-nodistro-repos').with_ensure('absent') }
           it { is_expected.to contain_file('/etc/pbuilder/jammy64/hooks/F66-add-nodesource-repos').with_ensure('absent') }
           it { is_expected.to contain_file('/etc/pbuilder/jammy64/hooks/F66-add-nodesource-nodistro-repos').with_ensure('present') }
+          it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F66-add-nodesource-repos').with_ensure('absent') }
+          it { is_expected.to contain_file('/etc/pbuilder/bookworm64/hooks/F66-add-nodesource-nodistro-repos').with_ensure('absent') }
           it { is_expected.to contain_file('/etc/pbuilder/bullseye64/hooks/F67-add-puppet-repos').with_ensure('present') }
           it { is_expected.to contain_file('/etc/pbuilder/bullseye64/hooks/F70aptupdate').with_ensure('present') }
           it { is_expected.to contain_file('/etc/pbuilder/bullseye64/hooks/F99printrepos').with_ensure('present') }