Merge pull request #9388 from skyamgarp/PA-6305

(PA-6305) Update tests for Ubuntu 24 ARM systemd behavior
puppetlabs · Jun 11, 2024 · a423af8 · a423af8
2 parents 8273f16 + c89c20a
commit a423af8
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/acceptance/tests/resource/service/ticket_5024_systemd_enabling_masked_service.rb b/acceptance/tests/resource/service/ticket_5024_systemd_enabling_masked_service.rb
@@ -25,13 +25,15 @@
 
 agents.each do |agent|
   platform = agent.platform.variant
+  init_script_systemd = "/usr/lib/systemd/system/#{package_name[platform]}.service"
 
-  if agent['platform'] =~ /ubuntu-24.04-amd64/
-    init_script_systemd = "/usr/lib/systemd/system/#{package_name[platform]}.service"
-  elsif agent['platform'] =~ /(debian|ubuntu)/
+  if agent['platform'] =~ /(ubuntu)/
+    version = on(agent, facter('os.release.full')).stdout.chomp.to_i
+    if version < 24
+      init_script_systemd = "/lib/systemd/system/#{package_name[platform]}.service"
+    end
+  elsif agent['platform'] =~ /debian/
     init_script_systemd = "/lib/systemd/system/#{package_name[platform]}.service"
-  else
-    init_script_systemd = "/usr/lib/systemd/system/#{package_name[platform]}.service"
   end
 
   symlink_systemd = "/etc/systemd/system/multi-user.target.wants/#{package_name[platform]}.service"