Use Puppet 6 with Vagrant testing

This also fixes an issue where vagrant was using a slightly older version of stdlib than what was listed in the metadata.
ghoneycutt · Nov 17, 2020 · e361d93 · e361d93
1 parent 7ffdb47
commit e361d93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/provision_basic_debian.sh b/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
diff --git a/tests/provision_basic_el.sh b/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