beaker-puppet 1.26.1 → 1.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7881155eff720047edee385b9d3a8809eb9108a6b4a8e11804921db18aeb9cd5
-  data.tar.gz: 5b1e5543bd316c178d86ab7c6d7210d72827bf4637d308bba8f536392a2a77cf
+  metadata.gz: 68502ef5f5e7277b97ce2192ef1d51f571d084e705e98d69f1f4a53e303fcac0
+  data.tar.gz: 3c3c471c33bf0481e6a3d8e44fdaabae4f5efec04377f56a66135d905995c043
 SHA512:
-  metadata.gz: e02efc2cebc7153164768360aa56bbe5fed898de6d0ebed8755a4551e53acee14d1c565a4314628cd9e7dd5f544f58dffc09cd29608f8d73c897c5264df9669b
-  data.tar.gz: 96a4681f9d4b2917c430c912df50a4bf334a28d57fab9648bf13eb9218955fd42f4df3deb601f05c5620ad91f3aaad5603cc786085e6791491e141e6110d74fe
+  metadata.gz: 036c6489dd3157d13fb07123dfc27dba5bf7ef1e6ac488f8230942072057a01fd9f32a36922747fc8e656562ffc88f967e0c54f7b4ca15dab9ba4ae6c2ce88dc
+  data.tar.gz: bca6b6878ed42eb9126af029381df3144c5c7e540ffafc07031c14d478e34212256ccf56dd4b9972852ef0f894616b7c1ed95e8b2c7a3f31587a223abbad03e5

data/CHANGELOG.md

@@ -2,6 +2,38 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.27.0](https://github.com/voxpupuli/beaker-puppet/tree/1.27.0) (2022-08-31)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.26.3...1.27.0)
+
+**Implemented enhancements:**
+
+- \(ITSYS-2543\) Adds workaround for EL8 PPCLE [\#198](https://github.com/voxpupuli/beaker-puppet/pull/198) ([mhashizume](https://github.com/mhashizume))
+
+**Fixed bugs:**
+
+- \(PA-4566\) Retry beaker exec if presuite completes [\#195](https://github.com/voxpupuli/beaker-puppet/pull/195) ([joshcooper](https://github.com/joshcooper))
+
+## [1.26.3](https://github.com/voxpupuli/beaker-puppet/tree/1.26.3) (2022-08-09)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.26.2...1.26.3)
+
+**Fixed bugs:**
+
+- Actually print the versions.txt file [\#193](https://github.com/voxpupuli/beaker-puppet/pull/193) ([joshcooper](https://github.com/joshcooper))
+
+**Merged pull requests:**
+
+- Release 1.26.3 [\#196](https://github.com/voxpupuli/beaker-puppet/pull/196) ([joshcooper](https://github.com/joshcooper))
+
+## [1.26.2](https://github.com/voxpupuli/beaker-puppet/tree/1.26.2) (2022-05-31)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.26.1...1.26.2)
+
+**Merged pull requests:**
+
+- \(PA-4178\) Only clear and add non-default gem sources [\#190](https://github.com/voxpupuli/beaker-puppet/pull/190) ([joshcooper](https://github.com/joshcooper))
+
 ## [1.26.1](https://github.com/voxpupuli/beaker-puppet/tree/1.26.1) (2022-03-24)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.26.0...1.26.1)

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

@@ -1625,12 +1625,18 @@ module Beaker
         # Configures gem sources on hosts to use a mirror, if specified
         # This is a duplicate of the Gemfile logic.
         def configure_gem_mirror(hosts)
-          gem_source = ENV['GEM_SOURCE'] || 'https://rubygems.org'
-
-          Array(hosts).each do |host|
-            gem = gem_command(host)
-            on host, "#{gem} source --clear-all"
-            on host, "#{gem} source --add #{gem_source}"
+          gem_source = ENV['GEM_SOURCE']
+
+          # Newer versions of rubygems always default the source to https://rubygems.org
+          # and versions >= 3.1 will try to prompt (and fail) if you add a source that is
+          # too similar to rubygems.org to prevent typo squatting:
+          # https://github.com/rubygems/rubygems/commit/aa967b85dd96bbfb350f104125f23d617e82a00a
+          if gem_source && gem_source !~ /rubygems\.org/
+            Array(hosts).each do |host|
+              gem = gem_command(host)
+              on host, "#{gem} source --clear-all"
+              on(host, "#{gem} source --add #{gem_source}")
+            end
           end
         end
       end

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

@@ -177,11 +177,13 @@ module Beaker
             # emit the misc/versions.txt file which contains component versions for
             # puppet, facter, hiera, pxp-agent, packaging and vendored Ruby
             [
-              '"${env:ProgramFiles}/Puppet Labs/puppet/misc/versions.txt"',
-              '"${env:ProgramFiles(x86)}/Puppet Labs/puppet/misc/versions.txt"'
+              "'%PROGRAMFILES%\\Puppet Labs\\puppet\\misc\\versions.txt'",
+              "'%PROGRAMFILES(X86)%\\Puppet Labs\\puppet\\misc\\versions.txt'",
             ].each do |path|
-              if file_exists_on(host, path)
-                logger.info(file_contents_on(host, path)) && break
+              result = on(host, "cmd /c type #{path}", :accept_all_exit_codes => true)
+              if result.exit_code == 0
+                logger.info(result.stdout)
+                break
               end
             end
           end

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.26.1'
+  VERSION = '1.27.0'
 end

data/setup/common/005_redhat_subscription_fix.rb

@@ -0,0 +1,10 @@
+test_name 'Refresh Red Hat 8 subscription repository'
+
+# Only need to run this on Red Hat Enterprise Linux 8 on little-endian PowerPC
+skip_test 'Not Red Hat 8 PPCle' if ! hosts.any? { |host| host.platform == 'el-8-ppc64le' }
+
+hosts.each do |host|
+  next unless host.platform == 'el-8-ppc64le'
+
+  on(host, '/usr/sbin/subscription-manager repos --disable rhel-8-for-ppc64le-baseos-rpms && /usr/sbin/subscription-manager repos --enable rhel-8-for-ppc64le-baseos-rpms')
+end

data/spec/beaker-puppet/install_utils/puppet_utils_spec.rb

@@ -153,7 +153,9 @@ describe ClassMixedWithDSLInstallUtils do
 
   describe '#puppet_collection_for' do
     it 'raises an error when given an invalid package' do
-      expect { subject.puppet_collection_for(:foo, '5.5.4') }.to raise_error
+      expect {
+        subject.puppet_collection_for(:foo, '5.5.4')
+      }.to raise_error(RuntimeError, /package must be one of puppet_agent, puppet, puppetserver/)
     end
 
     context 'when the :puppet_agent package is passed in' do

data/spec/beaker-puppet/install_utils/windows_utils_spec.rb

@@ -26,31 +26,45 @@ describe ClassMixedWithDSLInstallUtils do
                                 :is_cygwin => 'false' } ) }
   let(:hosts)              { [ winhost, winhost_non_cygwin ] }
 
-  def expect_install_called(times = hosts.length)
-    result = expect( Beaker::Command ).to receive( :new )
-      .with( /^"#{batch_path}"$/, [], {:cmdexe => true})
-      .exactly( times ).times
+  def expect_install_called
+    result = Beaker::Result.new(nil, 'temp')
+    result.exit_code = 0
 
-    yield result if block_given?
+    hosts.each do |host|
+      expectation = expect(subject).to receive(:on).with(host, having_attributes(command: "\"#{batch_path}\""), anything).and_return(result)
+      if block_given?
+        should_break = yield expectation
+        break if should_break
+      end
+    end
   end
 
-  def expect_status_called(times = hosts.length)
-    expect( Beaker::Command ).to receive( :new )
-      .with( "sc qc puppet || sc qc pe-puppet", [], {:cmdexe => true} )
-      .exactly( times ).times
+  def expect_status_called(start_type = 'DEMAND_START')
+    result = Beaker::Result.new(nil, 'temp')
+    result.exit_code = 0
+    result.stdout = case start_type
+                    when 'DISABLED'
+                      "        START_TYPE         : 4   DISABLED"
+                    when 'AUTOMATIC'
+                      "        START_TYPE         : 2   AUTO_START"
+                    else # 'DEMAND_START'
+                      "        START_TYPE         : 3   DEMAND_START"
+                    end
+
+    hosts.each do |host|
+      expect(subject).to receive(:on).with(host, having_attributes(command: "sc qc puppet || sc qc pe-puppet")).and_yield(result)
+    end
   end
 
   def expect_version_log_called(times = hosts.length)
-    path = %{"${env:ProgramFiles}/Puppet Labs/puppet/misc/versions.txt"}
+    path = "'%PROGRAMFILES%\\Puppet Labs\\puppet\\misc\\versions.txt'"
 
-    expect( subject ).to receive( :file_exists_on )
-      .with(anything, path)
-      .exactly( times ).times
-      .and_return(true)
+    result = Beaker::Result.new(nil, 'temp')
+    result.exit_code = 0
 
-    expect( subject ).to receive( :file_contents_on )
-      .with(anything, path)
-      .exactly( times ).times
+    hosts.each do |host|
+      expect(subject).to receive(:on).with(host, "cmd /c type #{path}", anything).and_return(result)
+    end
   end
 
   def expect_script_matches(hosts, contents)
@@ -68,30 +82,43 @@ describe ClassMixedWithDSLInstallUtils do
       expect(host).to receive(:is_x86_64?).and_return(:true)
     end
 
-    expect( Beaker::Command ).to receive( :new )
-      .with(%r{reg query "HKLM\\SOFTWARE\\Wow6432Node\\Puppet Labs\\PuppetInstaller}, [], {:cmdexe => true})
-      .exactly(times).times
+    hosts.each do |host|
+      expect(subject).to receive(:on)
+        .with(host, having_attributes(command: %r{reg query "HKLM\\SOFTWARE\\Wow6432Node\\Puppet Labs\\PuppetInstaller}))
+    end
   end
 
-  def expect_puppet_path_called(times = 1)
-    expect( Beaker::Command ).to receive( :new )
-      .with( 'puppet -h', [], {:cmdexe => true} )
-      .exactly( times ).times
+  def expect_puppet_path_called
+    hosts.each do |host|
+      next if host.is_cygwin?
+
+      result = Beaker::Result.new(nil, 'temp')
+      result.exit_code = 0
+
+      expect(subject).to receive(:on)
+        .with(host, having_attributes(command: 'puppet -h'), anything)
+        .and_return(result)
+    end
   end
 
   describe "#install_msi_on" do
     let( :log_file )    { '/fake/log/file.log' }
 
     before :each do
-      exit_code_result = Beaker::Result.new(nil, 'temp')
-      exit_code_result.exit_code = 0
+      result = Beaker::Result.new(nil, 'temp')
+      result.exit_code = 0
+
+      hosts.each do |host|
+        allow(subject).to receive(:on)
+          .with(host, having_attributes(command: "\"#{batch_path}\""))
+          .and_return(result)
+      end
 
-      allow( subject ).to receive( :on ).and_return( exit_code_result )
       allow( subject ).to receive( :file_exists_on ).and_return(true)
       allow( subject ).to receive( :create_install_msi_batch_on ).and_return( [batch_path, log_file] )
     end
 
-    it "will specify a PUPPET_AGENT_STARTUP_MODE of Manual (disabling the service) by default" do
+    it "will specify a PUPPET_AGENT_STARTUP_MODE of Manual by default" do
       expect_install_called
       expect_puppet_path_called
       expect_status_called
@@ -103,10 +130,10 @@ describe ClassMixedWithDSLInstallUtils do
       subject.install_msi_on(hosts, msi_path, {})
     end
 
-    it "allows configuration of PUPPET_AGENT_STARTUP_MODE" do
+    it "allows configuration of PUPPET_AGENT_STARTUP_MODE to Automatic" do
       expect_install_called
       expect_puppet_path_called
-      expect_status_called
+      expect_status_called('AUTOMATIC')
       expect_reg_query_called
       expect_version_log_called
       value = 'Automatic'
@@ -116,6 +143,19 @@ describe ClassMixedWithDSLInstallUtils do
       subject.install_msi_on(hosts, msi_path, {'PUPPET_AGENT_STARTUP_MODE' => value})
     end
 
+    it "allows configuration of PUPPET_AGENT_STARTUP_MODE to Disabled" do
+      expect_install_called
+      expect_puppet_path_called
+      expect_status_called('DISABLED')
+      expect_reg_query_called
+      expect_version_log_called
+      value = 'Disabled'
+      expect( subject ).to receive( :create_install_msi_batch_on ).with(
+        anything, anything,
+        {'PUPPET_AGENT_STARTUP_MODE' => value})
+      subject.install_msi_on(hosts, msi_path, {'PUPPET_AGENT_STARTUP_MODE' => value})
+    end
+
     it "will not generate a command to emit a log file without the :debug option set" do
       expect_install_called
       expect_puppet_path_called
@@ -130,13 +170,15 @@ describe ClassMixedWithDSLInstallUtils do
 
     it "will generate a command to emit a log file when the install script fails" do
       # note a single failure aborts executing against remaining hosts
-      hosts_affected = 1
-
-      expect_install_called(hosts_affected) { |e| e.and_raise }
-      expect_status_called(0)
+      expect_install_called do |e|
+        e.and_raise
+        true # break
+      end
 
       expect( subject ).to receive( :file_contents_on ).with(anything, log_file)
-      expect { subject.install_msi_on(hosts, msi_path) }.to raise_error(RuntimeError)
+      expect {
+        subject.install_msi_on(hosts, msi_path)
+      }.to raise_error(RuntimeError)
     end
 
     it "will generate a command to emit a log file with the :debug option set" do
@@ -146,7 +188,7 @@ describe ClassMixedWithDSLInstallUtils do
       expect_status_called
       expect_version_log_called
 
-      expect( subject ).to receive( :file_contents_on ).with(anything, log_file).twice
+      expect( subject ).to receive( :file_contents_on ).with(anything, log_file).exactly(hosts.length).times
 
       subject.install_msi_on(hosts, msi_path, {}, { :debug => true })
     end
@@ -171,13 +213,12 @@ describe ClassMixedWithDSLInstallUtils do
 
       hosts.each do |host|
         expect(host).to receive(:is_x86_64?).and_return(true)
-      end
 
-      expect( Beaker::Command ).to receive( :new )
-        .with('reg query "HKLM\\SOFTWARE\\Wow6432Node\\Puppet Labs\\PuppetInstaller" /v "RememberedPuppetAgentStartupMode" | findstr Foo', [], {:cmdexe => true})
-        .exactly(hosts.length).times
+        expect(subject).to receive(:on)
+        .with(host, having_attributes(command: 'reg query "HKLM\\SOFTWARE\\Wow6432Node\\Puppet Labs\\PuppetInstaller" /v "RememberedPuppetAgentStartupMode" | findstr Manual'))
+      end
 
-      subject.install_msi_on(hosts, msi_path, {'PUPPET_AGENT_STARTUP_MODE' => "Foo"})
+      subject.install_msi_on(hosts, msi_path, {'PUPPET_AGENT_STARTUP_MODE' => "Manual"})
     end
 
     it 'will omit Wow6432Node in the registry search for remembered startup setting on 32-bit hosts' do
@@ -188,13 +229,12 @@ describe ClassMixedWithDSLInstallUtils do
 
       hosts.each do |host|
         expect(host).to receive(:is_x86_64?).and_return(false)
-      end
 
-      expect( Beaker::Command ).to receive( :new )
-        .with('reg query "HKLM\\SOFTWARE\\Puppet Labs\\PuppetInstaller" /v "RememberedPuppetAgentStartupMode" | findstr Foo', [], {:cmdexe => true})
-        .exactly(hosts.length).times
+        expect(subject).to receive(:on)
+          .with(host, having_attributes(command: 'reg query "HKLM\\SOFTWARE\\Puppet Labs\\PuppetInstaller" /v "RememberedPuppetAgentStartupMode" | findstr Manual'))
+      end
 
-      subject.install_msi_on(hosts, msi_path, {'PUPPET_AGENT_STARTUP_MODE' => "Foo"})
+      subject.install_msi_on(hosts, msi_path, {'PUPPET_AGENT_STARTUP_MODE' => "Manual"})
     end
   end
 

data/tasks/ci.rake

@@ -285,17 +285,22 @@ def beaker_suite_retry(type)
   beaker(:provision)
 
   begin
-    json_results_file = Tempfile.new
-
     beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(type))
     beaker(:exec, 'pre-suite', '--preserve-state')
-    beaker(:exec, ENV['TESTS'], '--test-results-file', json_results_file.path)
-  rescue RuntimeError
-    tests_to_rerun = JSON.load(File.read(json_results_file.path))
-    if tests_to_rerun.length > 0
-      puts '*** Retrying the following:'
-      puts tests_to_rerun.map { |spec| "  #{spec}" }
-      beaker(:exec, tests_to_rerun.map { |str| "#{str}" }.join(',') )
+
+    begin
+      json_results_file = Tempfile.new
+      beaker(:exec, ENV['TESTS'], '--test-results-file', json_results_file.path)
+    rescue RuntimeError => e
+      puts "ERROR: #{e.message}"
+      tests_to_rerun = JSON.load(File.read(json_results_file.path))
+      if tests_to_rerun.nil? || tests_to_rerun.empty?
+        raise e
+      else
+        puts '*** Retrying the following:'
+        puts tests_to_rerun.map { |spec| "  #{spec}" }
+        beaker(:exec, tests_to_rerun.map { |str| "#{str}" }.join(',') )
+      end
     end
   ensure
     beaker(:exec, 'post-suite')
@@ -312,6 +317,7 @@ def pre_suites(type)
     [
       "#{beaker_root}/setup/common/000-delete-puppet-when-none.rb",
       "#{beaker_root}/setup/common/003_solaris_cert_fix.rb",
+      "#{beaker_root}/setup/common/005_redhat_subscription_fix.rb",
       "#{beaker_root}/setup/aio/010_Install_Puppet_Agent.rb",
       "#{beaker_root}/setup/common/011_Install_Puppet_Server.rb",
       "#{beaker_root}/setup/common/012_Finalize_Installs.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.26.1
+  version: 1.27.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -221,6 +221,7 @@ files:
 - setup/aio/010_Install_Puppet_Agent.rb
 - setup/common/000-delete-puppet-when-none.rb
 - setup/common/003_solaris_cert_fix.rb
+- setup/common/005_redhat_subscription_fix.rb
 - setup/common/011_Install_Puppet_Server.rb
 - setup/common/012_Finalize_Installs.rb
 - setup/common/020_InstallCumulusModules.rb
@@ -269,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.2.33
 signing_key: 
 specification_version: 4
 summary: Beaker's Puppet DSL Extension Helpers!