Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adopt to latest puppetlabs/apt changes #740

Merged
merged 2 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions manifests/osfamily/debian.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions spec/classes/puppet_agent_osfamily_debian_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,14 @@
is_expected.to contain_apt__setting('conf-pe-repo')
.with({
'priority' => 90,
'content' => '',
'ensure' => 'absent',
})
}

it {
is_expected.to contain_apt__setting('list-puppet-enterprise-installer')
.with({
'content' => '',
'ensure' => 'absent',
'ensure' => 'absent',
})
}
end
Expand Down
Loading