From 60272f60d127178c6ccb657a6834c0d8caf61f7a Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Tue, 21 Nov 2023 09:35:31 -0800 Subject: [PATCH 1/2] (maint) Remove logic for unsupported OS --- .../service/ticket_5024_systemd_enabling_masked_service.rb | 7 ------- 1 file changed, 7 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 index 67b5598c14c..f3682083547 100644 --- a/acceptance/tests/resource/service/ticket_5024_systemd_enabling_masked_service.rb +++ b/acceptance/tests/resource/service/ticket_5024_systemd_enabling_masked_service.rb @@ -43,13 +43,6 @@ package { '#{package_name[platform]}': ensure => present, } - if ($::operatingsystem == 'Fedora') and ($::operatingsystemmajrelease == '23') { - package{'libnghttp2': - ensure => latest, - install_options => '--best', - before => Package['httpd'], - } - } } manifest_service_masked = %Q{ service { '#{package_name[platform]}': From 78a5423e7b40d8315ee64345699235f90930ceec Mon Sep 17 00:00:00 2001 From: Michael Hashizume Date: Tue, 21 Nov 2023 09:42:57 -0800 Subject: [PATCH 2/2] (PUP-11986) Add Amazon Linux package mapping This commit adds a mapping for a package for Amazon Linux to use for the systemd masked services test. --- .../service/ticket_5024_systemd_enabling_masked_service.rb | 1 + 1 file changed, 1 insertion(+) 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 index f3682083547..30ce975d864 100644 --- a/acceptance/tests/resource/service/ticket_5024_systemd_enabling_masked_service.rb +++ b/acceptance/tests/resource/service/ticket_5024_systemd_enabling_masked_service.rb @@ -17,6 +17,7 @@ package_name = {'el' => 'httpd', 'centos' => 'httpd', 'fedora' => 'httpd', + 'amazon' => 'httpd', 'sles' => 'apache2', 'debian' => 'cron', # apache2 does not create systemd service symlinks in Debian 'ubuntu' => 'cron', # See https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1447807