[sysadmin/neon-tooling] /: only preinstall pkg-kde-tools-neon on noble

Git commit 2440bee9a040194bfb5273b92e5e369b22ae9944 by Carlos De Maine.
Committed on 21/07/2026 at 01:25.
Pushed by carlosdem into branch 'master'.

only preinstall pkg-kde-tools-neon on noble

as it's now an empty package in resolute

M  +4    -1    nci/lib/setup_repo.rb
M  +4    -1    test/test_nci_setup_repo.rb

https://invent.kde.org/sysadmin/neon-tooling/-/commit/2440bee9a040194bfb5273b92e5e369b22ae9944

diff --git a/nci/lib/setup_repo.rb b/nci/lib/setup_repo.rb
index f5bf1102..9e3c58fa 100644
--- a/nci/lib/setup_repo.rb
+++ b/nci/lib/setup_repo.rb
@@ -59,7 +59,10 @@ module NCI
     # Make sure we have the latest pkg-kde-tools, not whatever is in the image.
     return unless with_install
 
-    deps = %w[neon-settings-2 pkg-kde-tools pkg-kde-tools-neon debhelper cmake quilt dh-python dh-translations]
+    deps = %w[neon-settings-2 pkg-kde-tools debhelper cmake quilt dh-python dh-translations]
+    if dist == "noble"
+      deps << 'pkg-tools-kde-neon'
+    end
     deps << 'kde-release-keyring' unless ENV.fetch('JOB_NAME').include?('kde-keyring')
     raise 'failed to install deps' unless Apt.install(deps)
     
diff --git a/test/test_nci_setup_repo.rb b/test/test_nci_setup_repo.rb
index 8997d656..292949f1 100644
--- a/test/test_nci_setup_repo.rb
+++ b/test/test_nci_setup_repo.rb
@@ -91,7 +91,10 @@ class NCISetupRepoTest < TestCase
 
     system_calls += [
       ['apt-get', *Apt::Abstrapt.default_args, 'update'],
-      ['apt-get', *Apt::Abstrapt.default_args, 'install', 'pkg-kde-tools', 'pkg-kde-tools-neon', 'debhelper', 'cmake', 'quilt', 'dh-python', 'dh-translations']
+      ['apt-get', *Apt::Abstrapt.default_args, 'install', 'pkg-kde-tools', 'debhelper', 'cmake', 'quilt', 'dh-python', 'dh-translations']
+    if dist == "noble"
+      ['apt-get', *Apt::Abstrapt.default_args, 'install', 'pkg-kde-tools-neon']
+    end
     ]
 
     system_sequence = sequence('system-calls')