Merge pull request #232 from ghoneycutt/debian8_eol

Debian8 eol

.travis.yml

@@ -56,18 +56,6 @@ matrix:
  env: BEAKER_set="centos-8" BEAKER_PUPPET_COLLECTION=puppet6
  bundler_args:
  script: bundle exec rake beaker
- - rvm: 2.4.9
- sudo: required
- services: docker
- env: BEAKER_set="debian-8" BEAKER_PUPPET_COLLECTION=puppet5
- bundler_args:
- script: bundle exec rake beaker
- - rvm: 2.5.7
- sudo: required
- services: docker
- env: BEAKER_set="debian-8" BEAKER_PUPPET_COLLECTION=puppet6
- bundler_args:
- script: bundle exec rake beaker
  - rvm: 2.4.9
  sudo: required
  services: docker

README.md

@@ -172,7 +172,6 @@ module aims to support the current and previous major Puppet versions.
  * EL 6
  * EL 7
  * EL 8
- * Debian 8
  * Debian 9
  * Debian 10
  * Ubuntu 14.04 LTS
@@ -196,6 +195,7 @@ though are not functionally tested and formally supported.
  * Suse 15
  * OpenSuSE 13.1
  * Debian 7
+ * Debian 8
  * Ubuntu 12.04 LTS
 
 ## Development

Vagrantfile

@@ -43,13 +43,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  c.vm.provision :shell, :inline => "puppet apply /vagrant/tests/init.pp"
  end
 
- config.vm.define "debian8-pam", autostart: false do |c|
- c.vm.box = "debian/jessie64"
- c.vm.hostname = 'debian8-pam.example.com'
- c.vm.provision :shell, :path => "tests/provision_basic_debian.sh"
- c.vm.provision :shell, :inline => "puppet apply /vagrant/tests/init.pp"
- end
-
  config.vm.define "debian9-pam", autostart: false do |c|
  c.vm.box = "debian/stretch64"
  c.vm.hostname = 'debian9-pam.example.com'
@@ -77,4 +70,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
  c.vm.provision :shell, :path => "tests/provision_basic_debian.sh"
  c.vm.provision :shell, :inline => "puppet apply /vagrant/tests/init.pp"
  end
+
+ config.vm.define "ubuntu2004-pam", autostart: false do |c|
+ c.vm.box = "ubuntu/focal64"
+ c.vm.hostname = 'ubuntu2004-pam.example.com'
+ c.vm.provision :shell, :path => "tests/provision_basic_debian.sh"
+ c.vm.provision :shell, :inline => "puppet apply /vagrant/tests/init.pp"
+ end
 end

tests/provision_basic_debian.sh

@@ -31,7 +31,7 @@ apt-key adv --fetch-keys http://apt.puppetlabs.com/DEB-GPG-KEY-puppet
 apt-get -y install wget
 
 # install and configure puppet
-deb_install http://apt.puppetlabs.com/puppet5-release-${CODENAME}.deb
+deb_install http://apt.puppetlabs.com/puppet6-release-${CODENAME}.deb
 apt-get update
 apt-get -y install puppet-agent
 ln -s /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
@@ -40,5 +40,5 @@ ln -s /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
 puppet resource file /etc/puppetlabs/code/environments/production/modules/pam ensure=link target=/vagrant
 
 # setup module dependencies
-puppet module install puppetlabs/stdlib --version 4.22.0
+puppet module install puppetlabs/stdlib --version 4.25.0
 puppet module install trlinkin/nsswitch --version 2.1.0

tests/provision_basic_el.sh

@@ -20,7 +20,7 @@ yum install -y wget
 rpm -qa | grep -q puppet
 if [ $? -ne 0 ]
 then
- rpm_install http://yum.puppetlabs.com/puppet5/puppet5-release-el-${release}.noarch.rpm
+ rpm_install http://yum.puppetlabs.com/puppet6/puppet6-release-el-${release}.noarch.rpm
  yum -y install puppet-agent
  ln -s /opt/puppetlabs/puppet/bin/puppet /usr/bin/puppet
 fi
@@ -29,5 +29,5 @@ fi
 puppet resource file /etc/puppetlabs/code/environments/production/modules/pam ensure=link target=/vagrant
 
 # setup module dependencies
-puppet module install puppetlabs/stdlib --version 4.22.0
+puppet module install puppetlabs/stdlib --version 4.25.0
 puppet module install trlinkin/nsswitch --version 2.1.0