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.

Sign up for GitHub

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

Jump to bottom

[FM-6956] Removal of unsupported Debian 7 from apt #760

Merged
merged 1 commit into from
Jun 5, 2018
Merged

[FM-6956] Removal of unsupported Debian 7 from apt #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"7",
"8"
]
},
Expand Down
36 changes: 18 additions & 18 deletions spec/classes/apt_backports_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
context 'with defaults on deb' do
let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
lsbdistcodename: 'wheezy',
lsbdistcodename: 'jessie',
puppetversion: Puppet.version,
}
end
Expand All @@ -19,18 +19,18 @@
is_expected.to contain_apt__source('backports').with(location: 'http://deb.debian.org/debian',
key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
repos: 'main contrib non-free',
release: 'wheezy-backports',
pin: { 'priority' => 200, 'release' => 'wheezy-backports' })
release: 'jessie-backports',
pin: { 'priority' => 200, 'release' => 'jessie-backports' })
}
end
context 'with defaults on ubuntu' do
let(:facts) do
{
os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
lsbdistid: 'Ubuntu',
osfamily: 'Debian',
lsbdistcodename: 'trusty',
lsbdistrelease: '14.04',
lsbdistcodename: 'xenial',
lsbdistrelease: '16.04',
puppetversion: Puppet.version,
}
end
Expand All @@ -39,18 +39,18 @@
is_expected.to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu',
key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
repos: 'main universe multiverse restricted',
release: 'trusty-backports',
pin: { 'priority' => 200, 'release' => 'trusty-backports' })
release: 'xenial-backports',
pin: { 'priority' => 200, 'release' => 'xenial-backports' })
}
end
context 'with everything set' do
let(:facts) do
{
os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
lsbdistid: 'Ubuntu',
osfamily: 'Debian',
lsbdistcodename: 'trusty',
lsbdistrelease: '14.04',
lsbdistcodename: 'xenial',
lsbdistrelease: '16.04',
puppetversion: Puppet.version,
}
end
Expand All @@ -75,11 +75,11 @@
context 'when set things with hashes' do
let(:facts) do
{
os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
lsbdistid: 'Ubuntu',
osfamily: 'Debian',
lsbdistcodename: 'trusty',
lsbdistrelease: '14.04',
lsbdistcodename: 'xenial',
lsbdistrelease: '16.04',
puppetversion: Puppet.version,
}
end
Expand Down Expand Up @@ -185,11 +185,11 @@
describe 'validation' do
let(:facts) do
{
os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
lsbdistid: 'Ubuntu',
osfamily: 'Debian',
lsbdistcodename: 'trusty',
lsbdistrelease: '14.04',
lsbdistcodename: 'xenial',
lsbdistrelease: '16.04',
puppetversion: Puppet.version,
}
end
Expand Down
30 changes: 15 additions & 15 deletions spec/classes/apt_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,11 @@

context 'with sources defined on valid osfamily' do
let :facts do
{ os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04' } },
{ os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
osfamily: 'Debian',
lsbdistcodename: 'precise',
lsbdistcodename: 'xenial',
lsbdistid: 'Ubuntu',
lsbdistrelease: '12.04',
lsbdistrelease: '16.04',
puppetversion: Puppet.version }
end
let(:params) do
Expand Down Expand Up @@ -224,15 +224,15 @@
is_expected.to contain_apt__setting('list-puppetlabs').with(ensure: 'present')
}

it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com precise main$}) }
it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com xenial main$}) }
end

context 'with confs defined on valid osfamily' do
let :facts do
{
os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
osfamily: 'Debian',
lsbdistcodename: 'precise',
lsbdistcodename: 'xenial',
lsbdistid: 'Debian',
puppetversion: Puppet.version,
}
Expand Down Expand Up @@ -260,9 +260,9 @@
context 'with keys defined on valid osfamily' do
let :facts do
{
os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
osfamily: 'Debian',
lsbdistcodename: 'precise',
lsbdistcodename: 'xenial',
lsbdistid: 'Debian',
puppetversion: Puppet.version,
}
Expand Down Expand Up @@ -290,11 +290,11 @@
context 'with ppas defined on valid osfamily' do
let :facts do
{
os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
osfamily: 'Debian',
lsbdistcodename: 'precise',
lsbdistcodename: 'xenial',
lsbdistid: 'ubuntu',
lsbdistrelease: '12.04',
lsbdistrelease: '16.04',
puppetversion: Puppet.version,
}
end
Expand All @@ -312,9 +312,9 @@
context 'with settings defined on valid osfamily' do
let :facts do
{
os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
osfamily: 'Debian',
lsbdistcodename: 'precise',
lsbdistcodename: 'xenial',
lsbdistid: 'Debian',
puppetversion: Puppet.version,
}
Expand All @@ -333,9 +333,9 @@
context 'with pins defined on valid osfamily' do
let :facts do
{
os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
osfamily: 'Debian',
lsbdistcodename: 'precise',
lsbdistcodename: 'xenial',
lsbdistid: 'Debian',
puppetversion: Puppet.version,
}
Expand Down
28 changes: 14 additions & 14 deletions spec/classes/apt_update_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
context "when $::apt_update_last_success indicates #{desc}" do
let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
apt_update_last_success: factval,
lsbdistcodename: 'wheezy',
lsbdistcodename: 'jessie',
puppetversion: Puppet.version,
}
end
Expand All @@ -31,10 +31,10 @@
context 'when $::apt_update_last_success is nil' do
let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
lsbdistcodename: 'wheezy',
lsbdistcodename: 'jessie',
puppetversion: Puppet.version,
}
end
Expand All @@ -55,11 +55,11 @@
context "when $::apt_update_last_success indicates #{desc}" do
let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
apt_update_last_success: factval,
lsbdistcodename: 'wheezy',
lsbdistcodename: 'jessie',
puppetversion: Puppet.version,
}
end
Expand All @@ -74,10 +74,10 @@
context 'when $::apt_update_last_success is nil' do
let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
lsbdistcodename: 'wheezy',
lsbdistcodename: 'jessie',
puppetversion: Puppet.version,
}
end
Expand All @@ -95,11 +95,11 @@
context "when $::apt_update_last_success indicates #{desc}" do
let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
apt_update_last_success: factval,
lsbdistcodename: 'wheezy',
lsbdistcodename: 'jessie',
puppetversion: Puppet.version,
}
end
Expand All @@ -114,10 +114,10 @@
context 'when the $::apt_update_last_success fact has a recent value' do
let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
lsbdistcodename: 'wheezy',
lsbdistcodename: 'jessie',
apt_update_last_success: Time.now.to_i,
puppetversion: Puppet.version,
}
Expand All @@ -132,10 +132,10 @@
context 'when $::apt_update_last_success is nil' do
let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
lsbdistcodename: 'wheezy',
lsbdistcodename: 'jessie',
apt_update_last_success: nil,
puppetversion: Puppet.version,
}
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/conf_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
end
let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
lsbdistcodename: 'wheezy',
lsbdistcodename: 'jessie',
puppetversion: Puppet.version,
}
end
Expand Down
2 changes: 1 addition & 1 deletion spec/defines/key_compat_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def apt_key_example(title)

let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
puppetversion: Puppet.version,
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/key_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ def absent_apt_key(title)

let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
lsbdistcodename: 'wheezy',
lsbdistcodename: 'jessie',
puppetversion: Puppet.version,
}
end
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/pin_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
end
let(:facts) do
{
os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
lsbdistid: 'Debian',
osfamily: 'Debian',
lsbdistcodename: 'wheezy',
lsbdistcodename: 'jessie',
puppetversion: Puppet.version,
}
end
Expand Down
Loading