From 41d06c42664f2ae76d9bcb94d155ee1f24b80ca2 Mon Sep 17 00:00:00 2001
From: Josh Cooper <joshcooper@users.noreply.github.com>
Date: Wed, 20 Nov 2024 09:32:30 -0800
Subject: [PATCH 1/2] Remove Litmus from Gemfile

We do not use Litmus for tests and its dependencies are causing issues
in our CI pipeline. This commit removes Litmus from the Gemfile.
---
 Gemfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 1eed87a0..7de2f252 100644
--- a/Gemfile
+++ b/Gemfile
@@ -51,7 +51,6 @@ group :development, :release_prep do
   gem "puppetlabs_spec_helper", '~> 7.0', require: false
 end
 group :system_tests do
-  gem "puppet_litmus", '~> 1.0',      require: false, platforms: [:ruby, :x64_mingw]
   gem "CFPropertyList", '< 3.0.7',    require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "serverspec", '~> 2.41',        require: false
   gem "voxpupuli-acceptance", '~> 3', require: false

From 84850a5b8642efe7b95e655c335bb6bb4d3e7bf2 Mon Sep 17 00:00:00 2001
From: Tim Meusel <tim@bastelfreak.de>
Date: Thu, 21 Nov 2024 14:32:39 +0100
Subject: [PATCH 2/2] Adopt to latest puppetlabs/apt changes

for the changes in https://github.com/puppetlabs/puppetlabs-apt/commit/1e1baadf8158a878562b8aab1924a3db5b777a0c#diff-792ade83ea45b5c6696875678e6e7cc52f4a105db6ed4d8b6f2933ec5d7d6f3bR25-R26

see also https://github.com/puppetlabs/puppetlabs-puppet_agent/pull/738#issuecomment-2489350309
---
 manifests/osfamily/debian.pp                      | 2 --
 spec/classes/puppet_agent_osfamily_debian_spec.rb | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/manifests/osfamily/debian.pp b/manifests/osfamily/debian.pp
index 3cc2f525..5138c61d 100644
--- a/manifests/osfamily/debian.pp
+++ b/manifests/osfamily/debian.pp
@@ -60,13 +60,11 @@
         # Pass in an empty content string since apt requires it even though we are removing it
         apt::setting { 'list-puppet-enterprise-installer':
           ensure  => absent,
-          content => '',
         }
 
         apt::setting { 'conf-pe-repo':
           ensure   => absent,
           priority => '90',
-          content  => '',
         }
       } else {
         $source = $puppet_agent::apt_source
diff --git a/spec/classes/puppet_agent_osfamily_debian_spec.rb b/spec/classes/puppet_agent_osfamily_debian_spec.rb
index 3601dd39..bf42425c 100644
--- a/spec/classes/puppet_agent_osfamily_debian_spec.rb
+++ b/spec/classes/puppet_agent_osfamily_debian_spec.rb
@@ -58,7 +58,6 @@
         is_expected.to contain_apt__setting('conf-pe-repo')
           .with({
                   'priority' => 90,
-                  'content'  => '',
                   'ensure'   => 'absent',
                 })
       }
@@ -66,8 +65,7 @@
       it {
         is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
           .with({
-                  'content' => '',
-                  'ensure'  => 'absent',
+                  'ensure' => 'absent',
                 })
       }
     end