Skip to content

Commit

Permalink
Drop Debian 11 support
Browse files Browse the repository at this point in the history
Foreman 3.13 doesn't provide Debian 11 packages anymore.
  • Loading branch information
bastelfreak committed Dec 18, 2024
1 parent 38e9bab commit 5d0b014
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
12 changes: 6 additions & 6 deletions manifests/providers/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
# OS specific package names
case $facts['os']['family'] {
'RedHat': {
if $is_aio {
$oauth_package = 'puppet-agent-oauth'
$oauth_package = if $is_aio {
'puppet-agent-oauth'
} else {
$oauth_package = 'rubygem-oauth'
'rubygem-oauth'
}
}
'Debian': {
if $is_aio {
$oauth_package = 'puppet-agent-oauth'
$oauth_package = if $is_aio {
'puppet-agent-oauth'
} else {
$oauth_package = 'ruby-oauth'
'ruby-oauth'
}
}
'FreeBSD': {
Expand Down
1 change: 0 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"11",
"12"
]
},
Expand Down
16 changes: 8 additions & 8 deletions spec/defines/foreman_repos_apt_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
let(:title) { 'foreman' }

let :facts do
on_supported_os['debian-11-x86_64']
on_supported_os['debian-12-x86_64']
end

let(:apt_key) do
Expand All @@ -15,23 +15,23 @@
"foreman"
end

context 'with repo => 1.18' do
let(:params) { { repo: '1.18' } }
context 'with repo => 3.13' do
let(:params) { { repo: '3.13' } }

it { should contain_class('apt') }

it 'should add the 1.18 repo' do
it 'should add the 3.13 repo' do
should contain_apt__source('foreman')
.with_location('https://deb.theforeman.org/')
.with_repos('1.18')
.with_repos('3.13')

should contain_file('/etc/apt/sources.list.d/foreman.list')
.with_content(%r{deb https://deb\.theforeman\.org/ bullseye 1\.18})
.with_content(%r{deb https://deb\.theforeman\.org/ bookworm 3\.13})

should contain_apt__source('foreman-plugins')
.with_location('https://deb.theforeman.org/')
.with_release('plugins')
.with_repos('1.18')
.with_repos('3.13')
end

it { should contain_apt_key(apt_key_title).with_id(apt_key) }
Expand All @@ -48,7 +48,7 @@
.with_repos('nightly')

should contain_file('/etc/apt/sources.list.d/foreman.list')
.with_content(%r{deb https://deb\.theforeman\.org/ bullseye nightly})
.with_content(%r{deb https://deb\.theforeman\.org/ bookworm nightly})

should contain_apt__source('foreman-plugins')
.with_location('https://deb.theforeman.org/')
Expand Down

0 comments on commit 5d0b014

Please sign in to comment.