Merge pull request #1384 from voxpupuli/debian8

Drop Debian 8 support

.sync.yml

@@ -5,6 +5,5 @@
   - set: ubuntu1604-64
   - set: ubuntu1804-64
   - set: centos7-64
-  - set: debian8-64
   - set: debian9-64
   - set: debian10-64

.travis.yml

@@ -46,14 +46,6 @@ matrix:
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64 BEAKER_HYPERVISOR=docker CHECK=beaker
     services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
-    services: docker
-  - rvm: 2.5.3
-    bundler_args: --without development release
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian8-64 BEAKER_HYPERVISOR=docker CHECK=beaker
-    services: docker
   - rvm: 2.5.3
     bundler_args: --without development release
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64 BEAKER_HYPERVISOR=docker CHECK=beaker

Gemfile

@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'voxpupuli-test', '>= 1.0.0',  :require => false
+  gem 'voxpupuli-test', '>= 1.4.0',  :require => false
   gem 'coveralls',                   :require => false
   gem 'simplecov-console',           :require => false
   gem 'rspec-puppet-facts',          :require => false, :git => 'https://github.com/mcanevet/rspec-puppet-facts', :ref => '9541292d4fc35db3be1badace673c1108154b571'

manifests/params.pp

@@ -121,8 +121,7 @@
           'passenger_package_name'  => 'libnginx-mod-http-passenger',
           'include_modules_enabled' => true,
         }
-      } elsif ($facts['os']['name'] == 'ubuntu' and $facts['os']['distro']['codename'] in ['lucid', 'precise', 'trusty', 'xenial'])
-      or ($facts['os']['name'] == 'debian' and $facts['os']['release']['major'] in ['6', '7', '8']) {
+      } elsif ($facts['os']['name'] == 'ubuntu' and $facts['os']['distro']['codename'] in ['lucid', 'precise', 'trusty', 'xenial']) {
         $_module_os_overrides = {
           'manage_repo' => true,
           'daemon_user' => 'www-data',

metadata.json

@@ -27,7 +27,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "8",
         "9",
         "10"
       ]

spec/acceptance/class_spec.rb

@@ -38,42 +38,33 @@
   end
 
   context 'nginx with package_source passenger' do
-    # TODO: also test for (expected) failure on 5
-    unless fact('osfamily') == 'RedHat' && fact('operatingsystemmajrelease') == '5'
-      it 'runs successfully' do
-        shell(pkg_remove_cmd)
-        pp = <<-EOS
-          class { 'nginx':
-            package_source => 'passenger'
-          }
-        EOS
-
-        apply_manifest(pp, catch_failures: true)
-        apply_manifest(pp, catch_changes: true)
-      end
+    it 'runs successfully' do
+      shell(pkg_remove_cmd)
+      pp = <<-EOS
+        class { 'nginx':
+          package_source => 'passenger'
+        }
+      EOS
 
-      describe package('nginx') do
-        it { is_expected.to be_installed }
-        it 'comes from the expected source' do
-          pkg_output = shell(pkg_cmd)
-          expect(pkg_output.stdout).to match pkg_match
-        end
-      end
+      apply_manifest(pp, catch_failures: true)
+      apply_manifest(pp, catch_changes: true)
+    end
 
-      if fact('os.family') == 'Debian' && fact('os.release.major') == '8'
-        describe package('nginx-extras') do
-          it { is_expected.to be_installed }
-        end
+    describe package('nginx') do
+      it { is_expected.to be_installed }
+      it 'comes from the expected source' do
+        pkg_output = shell(pkg_cmd)
+        expect(pkg_output.stdout).to match pkg_match
       end
+    end
 
-      describe package('passenger') do
-        it { is_expected.to be_installed }
-      end
+    describe package('passenger') do
+      it { is_expected.to be_installed }
+    end
 
-      describe service('nginx') do
-        it { is_expected.to be_running }
-        it { is_expected.to be_enabled }
-      end
+    describe service('nginx') do
+      it { is_expected.to be_running }
+      it { is_expected.to be_enabled }
     end
   end