kitchen-puppet 3.5.2 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c75e7508998922548a42ffda9cd1cc63191ed9dc25e59b1a038aadb7f55750c9
-  data.tar.gz: 329b3b11b79f304f5bccda25c303bf1c222f8331c86074aaf0f3d108be617fb0
+  metadata.gz: 778238b260d5bf808d062fce6b9d04691cbdc163bccb3415c1476a177dcb4a5c
+  data.tar.gz: 150c20b4aacc250e66b7e5170a409f402539da21c3673a01ead03cc518a1bb05
 SHA512:
-  metadata.gz: 4895832d1bf85472efded1f7edb6d422f5afa44a934ceb3f348217ae34811c049c8884e3fb400431b2f1acd026e11b31424e0ebc7f6934808c4d5d0b84955f10
-  data.tar.gz: '09c3bf9f402734a4f2063576628e638d488174ecf2a1b6255c9dfcd5b4fa5c0fa2676218c4b7d6ba5ebfa79ab7f5abb797b8b947c3b6a0ca675dcbc544e2ce81'
+  metadata.gz: 31ea049e3e22598a59ecc0978d3a989bfa884a50cee32e9a1a8a132dbf19870caea9ef577b3eaa267eb115436901acfd6909b69ee8dff645bbb9d2f880bf6fa3
+  data.tar.gz: 0eb157d3efc15350f59b73272be43f5a940e0121ccfcad3c7a961ef63211b594219b6ac88d555a3356dc1449ee57b09713cbda57f00ad0e1f34843a443b435d9

data/lib/kitchen/provisioner/puppet/r10k.rb

@@ -47,7 +47,7 @@ module Kitchen
           ::R10K::Git::Cache.settings[:cache_root] = '.r10k/git'
           ::R10K::Forge::ModuleRelease.settings[:cache_root] = '.r10k/cache'
 
-          pf = ::R10K::Puppetfile.new(nil, path, puppetfile)
+          pf = ::R10K::Puppetfile.new("", path, puppetfile)
           pf.load
           pf.modules.map(&:sync)
         end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -215,6 +215,7 @@ module Kitchen
               #{custom_pre_install_command}
               if [ ! $(which puppet) ]; then
                 #{sudo('apt-get')} -y install wget
+                #{sudo('apt-get')} -y install apt-transport-https
                 #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
                 #{sudo('dpkg')} -i #{puppet_apt_repo_file}
                 #{update_packages_debian_cmd}
@@ -248,12 +249,13 @@ module Kitchen
             info("Installing puppet on #{puppet_platform}")
             info('Powershell is not recognised by core test-kitchen assuming it is present') unless powershell_shell?
             <<-INSTALL
+              #{custom_pre_install_command}
               if(Get-Command puppet -ErrorAction 0) { return; }
-              $architecture = if( [Environment]::Is64BitOperatingSystem ) { '-x64' } else { '' }
+              $architecture = if( [Environment]::Is64BitOperatingSystem ) { 'x64' } else { 'x86' }
               if( '#{puppet_windows_version}' -eq 'latest' ) {
                   $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-${architecture}-latest.msi"
-              } elseif( '#{puppet_windows_version}' -like '5.*' ) {
-                  $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet5/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
+              } elseif( '#{puppet_windows_version}' -match '(\\d)\\.' ) {
+                  $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet$($Matches[1])/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
               } else {
                   $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-#{puppet_windows_version}${architecture}.msi"
               }
@@ -263,8 +265,8 @@ module Kitchen
                   Write-Host "Installer failed."
                   Exit 1
               }
-
               #{install_busser}
+              #{custom_install_command}
             INSTALL
           else
             info('Installing puppet, will try to determine platform os')
@@ -280,6 +282,7 @@ module Kitchen
                      #{install_puppet_yum_repo}
                   else
                     #{sudo('apt-get')} -y install wget
+                    #{sudo('apt-get')} -y install apt-transport-https
                     #{sudo('wget')} #{wget_proxy_parm} #{puppet_apt_repo}
                     #{sudo('dpkg')} -i #{puppet_apt_repo_file}
                     #{update_packages_debian_cmd}
@@ -312,6 +315,7 @@ module Kitchen
           if [ ! -d "#{config[:puppet_coll_remote_path]}" ]; then
             if [ ! -f "#{config[:puppet_apt_collections_repo]}" ]; then
               #{sudo('apt-get')} -y install wget
+              #{sudo('apt-get')} -y install apt-transport-https
               #{sudo('wget')} #{wget_proxy_parm} #{config[:puppet_apt_collections_repo]}
             fi
             #{sudo('dpkg')} -i #{puppet_apt_coll_repo_file}
@@ -346,14 +350,15 @@ module Kitchen
           info("Installing Puppet Collections on #{puppet_platform}")
           info('Powershell is not recognised by core test-kitchen assuming it is present') unless powershell_shell?
           <<-INSTALL
+            #{custom_pre_install_command}
             if(Get-Command puppet -ErrorAction 0) { return; }
             $architecture = if( [Environment]::Is64BitOperatingSystem ) { 'x64' } else { 'x86' }
             if( '#{puppet_windows_version}' -eq 'latest' ) {
                 $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-${architecture}-latest.msi"
-            } elseif( '#{puppet_windows_version}' -like '5.*' ) {
-                $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet5/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
+            } elseif( '#{puppet_windows_version}' -match '(\\d)\\.' ) {
+                $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet$($Matches[1])/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
             } else {
-                $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-#{puppet_windows_version}${architecture}.msi"
+                $MsiUrl = "https://downloads.puppetlabs.com/windows/puppet-agent-#{puppet_windows_version}-${architecture}.msi"
             }
             Invoke-WebRequest $MsiUrl -UseBasicParsing -OutFile "C:/puppet-agent.msi" #{posh_proxy_parm}
             $process = Start-Process -FilePath msiexec.exe -Wait -PassThru -ArgumentList '/qn', '/norestart', '/i', 'C:\\puppet-agent.msi'
@@ -361,8 +366,8 @@ module Kitchen
                 Write-Host "Installer failed."
                 Exit 1
             }
-
             #{install_busser}
+            #{custom_install_command}
           INSTALL
         else
           info('Installing Puppet Collections, will try to determine platform os')
@@ -378,6 +383,7 @@ module Kitchen
                 #{sudo_env('yum')} -y --nogpgcheck install puppet-agent#{puppet_redhat_version}
               else
                 #{sudo('apt-get')} -y install wget
+                #{sudo('apt-get')} -y install apt-transport-https
                 #{sudo('wget')} #{wget_proxy_parm} #{config[:puppet_apt_collections_repo]}
                 #{sudo('dpkg')} -i #{puppet_apt_coll_repo_file}
                 #{sudo('apt-get')} update
@@ -1111,6 +1117,15 @@ module Kitchen
         case puppet_platform
         when 'ubuntu'
           case platform_version
+	  when '20.04'
+            # focal Repo
+            'https://apt.puppetlabs.com/puppet-release-focal.deb'
+          when '18.04'
+            # bionic Repo
+            'https://apt.puppetlabs.com/puppet-release-bionic.deb'
+          when '16.04'
+            # xenial Repo
+            'https://apt.puppetlabs.com/puppet-release-xenial.deb'          
           when '14.10'
             # Utopic Repo
             'https://apt.puppetlabs.com/puppetlabs-release-utopic.deb'
@@ -1126,6 +1141,12 @@ module Kitchen
           end
         when 'debian'
           case platform_version.gsub(/\..*/, '')
+ 	   when '10'
+             # Debian buster
+             'https://apt.puppetlabs.com/puppet-tools-release-buster.deb'
+           when '9'
+             # Debian xenial
+            'https://apt.puppetlabs.com/puppet-tools-release-stretch.deb'
           when '8'
             # Debian Jessie
             'https://apt.puppetlabs.com/puppetlabs-release-jessie.deb'

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '3.5.2'.freeze
+    VERSION = '3.6.0'.freeze
   end
 end

data/provisioner_options.md

@@ -187,11 +187,11 @@ To override a setting at the suite-level, specify the setting name under the sui
 
 It can be beneficial to keep different Puppet layouts for different suites. Rather than having to specify the manifest, modules, etc for each suite, you can create the following directory structure and they will automatically be found:
 
-    $kitchen_root/puppet/$suite_name/manifests
-    $kitchen_root/puppet/$suite_name/modules
-    $kitchen_root/puppet/$suite_name/hiera
-    $kitchen_root/puppet/$suite_name/hiera.yaml
-    $kitchen_root/puppet/$suite_name/Puppetfile
+    $kitchen_root/$suite_name/puppet/manifests
+    $kitchen_root/$suite_name/puppet/modules
+    $kitchen_root/$suite_name/puppet/hiera
+    $kitchen_root/$suite_name/puppet/hiera.yaml
+    $kitchen_root/$suite_name/puppet/Puppetfile
 
 ### Puppet Version
 When specifying a puppet version, you must use this format: "3.6.2-1puppetlabs1". I have

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.6.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-02 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -95,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.21
 signing_key: 
 specification_version: 4
 summary: puppet provisioner for test-kitchen