Skip to content

Commit

Permalink
Merge pull request #910 from ghoneycutt/904_drop_debian7
Browse files Browse the repository at this point in the history
(GH-904) Drop support for Debian 7 which is end of life (EOL)
  • Loading branch information
ghoneycutt authored Jun 18, 2018
2 parents 9d4b776 + 431c6ed commit 7a9e3ba
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 75 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,6 @@ matrix:
env: BEAKER_set="centos-7"
bundler_args:
script: bundle exec rake beaker
- rvm: 2.4.2
sudo: required
services: docker
env: BEAKER_set="debian-7"
bundler_args:
script: bundle exec rake beaker
- rvm: 2.4.2
sudo: required
services: docker
Expand Down
9 changes: 0 additions & 9 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
client.vm.provision :shell, :inline => "facter --custom-dir=/vagrant/lib/facter sensu_version"
end

config.vm.define "debian7-client", autostart: false do |client|
client.vm.box = "debian/wheezy64"
client.vm.hostname = 'debian7-client.example.com'
client.vm.network :private_network, ip: "192.168.56.18"
client.vm.provision :shell, :path => "tests/provision_basic_debian.sh"
client.vm.provision :shell, :inline => "puppet apply /vagrant/tests/sensu-client.pp"
client.vm.provision :shell, :inline => "facter --custom-dir=/vagrant/lib/facter sensu_version"
end

# The rsync used to populate /vagrant will fail if the repo has the spec
# fixtures created. To avoid, run `rake spec_clean` before `vagrant up`.
config.vm.define "macos-client", autostart: false do |client|
Expand Down
1 change: 0 additions & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"7",
"8",
"9"
]
Expand Down
25 changes: 0 additions & 25 deletions spec/acceptance/nodesets/debian-7.yml

This file was deleted.

36 changes: 2 additions & 34 deletions spec/classes/sensu_package_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -194,38 +194,6 @@
end

context 'Debian' do
context '7 (wheezy)' do
let(:facts) do
{
:kernel => 'Linux',
:osfamily => 'Debian',
:lsbdistid => 'Debian',
:lsbdistrelease => '7.11',
:os => {
:name => 'Debian',
:release => {
:full => '7.11',
},
:distro => {
:codename => 'wheezy',
},
},
}
end

context 'repo release' do
it { should contain_apt__source('sensu').with(
:ensure => 'present',
:location => 'https://sensu.global.ssl.fastly.net/apt',
:release => 'wheezy',
:repos => 'main',
:include => { 'src' => false },
:key => { 'id' => 'EE15CFF6AB6E4E290FDAB681A20F259AEB9C94BB', 'source' => 'https://sensu.global.ssl.fastly.net/apt/pubkey.gpg' },
:before => 'Package[sensu]'
) }
end
end

context '8 (jessie)' do
let(:facts) do
{
Expand Down Expand Up @@ -296,11 +264,11 @@
:kernel => 'Linux',
:osfamily => 'Debian',
:lsbdistid => 'Debian',
:lsbdistrelease => '7.11',
:lsbdistrelease => '9.3',
:os => {
:name => 'Debian',
:release => {
:full => '7.11',
:full => '9.3',
},
:distro => {
:codename => 'wheezy',
Expand Down

0 comments on commit 7a9e3ba

Please sign in to comment.