beaker-puppet 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e8e07f8616629904fa0d1a0dafb32f81c9c3c68
-  data.tar.gz: 027a86d8fa7512e09769d3c3baadc70d6a52664b
+  metadata.gz: 67910822a7a31f6110eb886e0531e411fd715d32
+  data.tar.gz: e2357ba3923f4dd77dacd9315de20b1aa3e71587
 SHA512:
-  metadata.gz: 5350380ad4d9901b7a18b7174e9e7ca04494d46ad5148605a349f72016a1bec17a15a56cf75a47a02fe31c26ea024584cb171792585d64a5bb0ec4863c0ca54b
-  data.tar.gz: a30b47610782db0029b33f8514271ca8af9e07785d3436f4bcd0681e0b162a2440e3700d52110b293557052a78c2fc72b0e494620fd778d72abd708845c0aaaa
+  metadata.gz: 321b51f3bad241af73abc86d741621a044b88ff40ccb8224e556e90b11dc94f2540d2001e74ce4417e27a95996183db7129e0172e4ee4d1c4abe21a4f17f4435
+  data.tar.gz: a77c9bf6335c681663137c07a6ad7078119a70fb933fbc480d007225798a6abe54ab6a07825cbfc41fc35bc0e6acdf4d1dd2a4de1e79298b00f88d9e715b18ec

data/lib/beaker-puppet/helpers/puppet_helpers.rb

@@ -828,7 +828,7 @@ module Beaker
         def sign_certificate_for(host = [])
           hostnames = []
           hosts = host.is_a?(Array) ? host : [host]
-          puppet_version = on(master, puppet('--version'))
+          puppet_version = on(master, puppet('--version')).stdout.chomp
           hosts.each{ |current_host|
             if [master, dashboard, database].include? current_host
               on current_host, puppet( 'agent -t' ), :acceptable_exit_codes => [0,1,2]

data/lib/beaker-puppet/install_utils/ezbake_utils.rb

@@ -69,7 +69,7 @@ module Beaker
         # @api private
         def ezbake_validate_support host
           variant, version, _, _ = host['platform'].to_array
-          unless variant =~ /^(fedora|el|centos|debian|ubuntu)$/
+          unless variant =~ /^(fedora|el|redhat|centos|debian|ubuntu)$/
             raise RuntimeError,
                   "No support for #{variant} within ezbake_utils ..."
           end

data/lib/beaker-puppet/install_utils/foss_utils.rb

@@ -347,7 +347,7 @@ module Beaker
             add_role(host, 'aio') #we are installing agent, so we want aio role
             package_name = nil
             case host['platform']
-            when /el-|fedora|sles|centos|cisco_/
+            when /el-|redhat|fedora|sles|centos|cisco_/
               package_name = 'puppet-agent'
               package_name << "-#{opts[:puppet_agent_version]}" if opts[:puppet_agent_version]
             when /debian|ubuntu|cumulus|huaweios/
@@ -941,8 +941,8 @@ module Beaker
             opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
 
             case variant
-            when /^(fedora|el|centos|sles|cisco_nexus|cisco_ios_xr)$/
-              variant_url_value = (($1 == 'centos') ? 'el' : $1)
+            when /^(fedora|el|redhat|centos|sles|cisco_nexus|cisco_ios_xr)$/
+              variant_url_value = ((['redhat','centos'].include?($1)) ? 'el' : $1)
               if variant == 'cisco_nexus'
                 variant_url_value = 'cisco-wrlinux'
                 version = '5'
@@ -1090,7 +1090,7 @@ module Beaker
                                   repo_configs_dir = nil,
                                   opts = options )
           variant, version, arch, codename = host['platform'].to_array
-          if variant !~ /^(fedora|el|centos|debian|ubuntu|cumulus|huaweios|cisco_nexus|cisco_ios_xr|sles)$/
+          if variant !~ /^(fedora|el|redhat|centos|debian|ubuntu|cumulus|huaweios|cisco_nexus|cisco_ios_xr|sles)$/
             raise "No repository installation step for #{variant} yet..."
           end
           repo_configs_dir ||= 'tmp/repo_configs'
@@ -1103,7 +1103,7 @@ module Beaker
           # url type
           _, protocol, hostname = opts[:dev_builds_url].partition /.*:\/\//
           dev_builds_url = protocol + hostname
-          dev_builds_url = opts[:dev_builds_url] if variant =~ /^(fedora|el|centos)$/
+          dev_builds_url = opts[:dev_builds_url] if variant =~ /^(fedora|el|redhat|centos)$/
 
           if variant =~ /^ubuntu$/ && version.split('.').first.to_i >= 18
             # Allow the use of unsigned repos with Ubuntu 18.04+
@@ -1130,7 +1130,7 @@ module Beaker
           if host['platform'] =~ /debian|ubuntu|cumulus|huaweios/
             find_filename = '*.deb'
             find_command  = 'dpkg -i'
-          elsif host['platform'] =~ /fedora|el|centos/
+          elsif host['platform'] =~ /fedora|el|redhat|centos/
             find_filename = '*.rpm'
             find_command  = 'rpm -ivh'
           else
@@ -1203,7 +1203,7 @@ module Beaker
             onhost_copy_base = opts[:copy_dir_external] || host.external_copy_base
 
             case variant
-            when /^(fedora|el|centos|debian|ubuntu|cumulus|huaweios|cisco_nexus|cisco_ios_xr)$/
+            when /^(fedora|el|redhat|centos|debian|ubuntu|cumulus|huaweios|cisco_nexus|cisco_ios_xr)$/
               if arch== 's390x' || host['hypervisor'] == 'ec2'
                 logger.trace("#install_puppet_agent_dev_repo_on: unsupported host #{host} for repo detected. using dev package")
               else
@@ -1236,12 +1236,12 @@ module Beaker
             case variant
             when /^eos/
               host.install_from_file( release_file )
-            when /^(sles|aix|fedora|el|centos)$/
+            when /^(sles|aix|fedora|el|redhat|centos)$/
               # NOTE: AIX does not support repo management. This block assumes
               # that the desired rpm has been mirrored to the 'repos' location.
               # NOTE: the AIX 7.1 package will only install on 7.2 with
               # --ignoreos. This is a bug in package building on AIX 7.1's RPM
-              if variant == "aix" and version == "7.2"
+              if variant == "aix" && version == "7.2"
                 aix_72_ignoreos_hack = "--ignoreos"
               end
               on host, "rpm -ivh #{aix_72_ignoreos_hack} #{onhost_copied_file}"

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end

data/setup/common/040_ValidateSignCert.rb

@@ -2,7 +2,7 @@ test_name "Validate Sign Cert" do
   skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
   hostname = on(master, 'facter hostname').stdout.strip
   fqdn = on(master, 'facter fqdn').stdout.strip
-  puppet_version = on(master, puppet("--version")).stdout
+  puppet_version = on(master, puppet("--version")).stdout.chomp
 
   if master.use_service_scripts?
     step "Ensure puppet is stopped"

data/spec/beaker-puppet/helpers/puppet_helpers_spec.rb

@@ -657,9 +657,11 @@ describe ClassMixedWithDSLHelpers do
         arg
       end
 
-      expect( subject ).to receive( :on ).with( master, '--version').once.and_return("6.0.0")
-      expect( subject ).to receive( :on ).with( master, 'puppetserver ca sign --all', :acceptable_exit_codes => [0, 24]).once
-      expect( subject ).to receive( :on ).with( master, 'puppetserver ca list --all').once.and_return( result )
+      version_result = double("version", :stdout => "6.0.0")
+      expect(subject).to receive(:on).with(master, '--version').and_return(version_result)
+      expect(subject).to receive(:version_is_less).and_return(false)
+      expect(subject).to receive(:on).with(master, 'puppetserver ca sign --all', :acceptable_exit_codes => [0, 24]).once
+      expect(subject).to receive(:on).with(master, 'puppetserver ca list --all').once.and_return(result)
 
       subject.sign_certificate_for( agent )
     end
@@ -673,9 +675,11 @@ describe ClassMixedWithDSLHelpers do
         arg
       end
 
-      expect( subject ).to receive( :on ).with( master, '--version').once.and_return("5.0.0")
-      expect( subject ).to receive( :on ).with( master, 'cert --sign --all --allow-dns-alt-names', :acceptable_exit_codes => [0, 24]).once
-      expect( subject ).to receive( :on ).with( master, 'cert --list --all').once.and_return( result )
+      version_result = double("version", :stdout => "5.0.0")
+      expect(subject).to receive(:on).with(master, '--version').and_return(version_result)
+      expect(subject).to receive(:version_is_less).and_return(true)
+      expect(subject).to receive(:on).with(master, 'cert --sign --all --allow-dns-alt-names', :acceptable_exit_codes => [0, 24]).once
+      expect(subject).to receive(:on).with(master, 'cert --list --all').once.and_return( result )
 
       subject.sign_certificate_for( agent )
     end
@@ -690,7 +694,8 @@ describe ClassMixedWithDSLHelpers do
         arg
       end
 
-      expect( subject ).to receive( :on ).with( master, "--version").once.and_return("6.0.0")
+      version_result = double("version", :stdout => "6.0.0")
+      expect(subject).to receive(:on).with(master, '--version').and_return(version_result)
       expect( subject ).to receive( :on ).with( master, 'puppetserver ca sign --all', :acceptable_exit_codes => [0, 24]).exactly( 11 ).times
       expect( subject ).to receive( :on ).with( master, 'puppetserver ca list --all').exactly( 11 ).times.and_return( result )
       expect( subject ).to receive( :fail_test ).once
@@ -708,7 +713,8 @@ describe ClassMixedWithDSLHelpers do
         arg
       end
       expect( subject ).to receive( :on ).with( master, "agent -t", :acceptable_exit_codes => [0, 1, 2]).once
-      expect( subject ).to receive( :on ).with( master, "--version").once.and_return("6.0.0")
+      version_result = double("version", :stdout => "6.0.0")
+      expect(subject).to receive(:on).with(master, '--version').and_return(version_result)
       expect( subject ).to receive( :on ).with( master, "puppetserver ca sign --certname master").once
       expect( subject ).to receive( :on ).with( master, "puppetserver ca sign --all", :acceptable_exit_codes => [0, 24]).once
       expect( subject ).to receive( :on ).with( master, "puppetserver ca list --all").once.and_return( result )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Puppet