beaker-puppet 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c0f5f48d98807a525e40040785d89a753d4400
-  data.tar.gz: 8c52841347557eb0ecd41a71082ddeb2d68ba99c
+  metadata.gz: d6082215f1011bfa1a62afb5863e4d207477fe23
+  data.tar.gz: 5f43469bc7a545f5bbda83d78b5425120723e1f3
 SHA512:
-  metadata.gz: 04feeac68d4174b1e66ef49348464856c0af0a27ac879a6f1bbca8adebd30c7253665237d221d2431551fa6dfc4389704fc8e360744b712c29e3c7469ef185ed
-  data.tar.gz: e874c30beb9edd42b9bc31f702b2941d4b1ed919df87c736e16c8435113df8d4659f36453ee6f49e84e86e103079e574fbf78eedaf2f02b2fdc763412ea00c3f
+  metadata.gz: f0023d9eb1b559504e4994f7b233d3d8e80f63618f865a0f6c1d0358c9dc08ee7596cd6f852f16c8ce8c2d2c9f81b5231822c6727a84664fa5cce8395440fc1e
+  data.tar.gz: 9a49f5b8afbe19505f5002fcfa9409f979fc6da8a970f8dc442a06e2c085772142786d9fd43d91ebf8164eccf57513d265497340b6fcd4e486d3f5949dfefdf9

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

@@ -8,11 +8,11 @@ module Beaker
 
         #Here be the default download URLs
         FOSS_DEFAULT_DOWNLOAD_URLS = {
-          :win_download_url         => "http://downloads.puppetlabs.com/windows",
-          :mac_download_url         => "http://downloads.puppetlabs.com/mac",
-          :pe_promoted_builds_url   => "http://pm.puppetlabs.com",
-          :release_apt_repo_url     => "http://apt.puppetlabs.com",
-          :release_yum_repo_url     => "http://yum.puppetlabs.com",
+          :win_download_url         => "http://downloads.puppet.com/windows",
+          :mac_download_url         => "http://downloads.puppet.com/mac",
+          :pe_promoted_builds_url   => "http://pm.puppet.com",
+          :release_apt_repo_url     => "http://apt.puppet.com",
+          :release_yum_repo_url     => "http://yum.puppet.com",
           :nightly_apt_repo_url     => "http://nightlies.puppet.com/apt",
           :nightly_yum_repo_url     => "http://nightlies.puppet.com/yum",
           :nightly_win_download_url => "http://nightlies.puppet.com/downloads/windows",

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.12.0'
+  VERSION = '1.13.0'
 end

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

@@ -312,11 +312,11 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'installs puppet on cygwin windows' do
       allow(subject).to receive(:link_exists?).and_return( true )
-      expect(subject).to receive(:on).with(winhost, "curl -o \"#{win_temp}\\puppet-3.7.1-x64.msi\" -O http://downloads.puppetlabs.com/windows/puppet-3.7.1-x64.msi")
+      expect(subject).to receive(:on).with(winhost, "curl -o \"#{win_temp}\\puppet-3.7.1-x64.msi\" -O http://downloads.puppet.com/windows/puppet-3.7.1-x64.msi")
       expect(subject).to receive(:on).with(winhost, " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
       expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.7.1-x64.msi", {}, {:debug => nil})
 
-      subject.install_puppet_from_msi( winhost, {:version => '3.7.1', :win_download_url => 'http://downloads.puppetlabs.com/windows'}  )
+      subject.install_puppet_from_msi( winhost, {:version => '3.7.1', :win_download_url => 'http://downloads.puppet.com/windows'}  )
     end
 
     it 'installs puppet on non-cygwin windows' do
@@ -326,12 +326,12 @@ describe ClassMixedWithDSLInstallUtils do
 
       expect(subject).to receive(:on).with(winhost_non_cygwin, instance_of( Beaker::Command )) do |host, beaker_command|
         expect(beaker_command.command).to eq('powershell.exe')
-        expect(beaker_command.args).to eq(["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command $webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('http://downloads.puppetlabs.com/windows/puppet-3.7.1.msi','#{win_temp}\\puppet-3.7.1.msi')"])
+        expect(beaker_command.args).to eq(["-ExecutionPolicy Bypass", "-InputFormat None", "-NoLogo", "-NoProfile", "-NonInteractive", "-Command $webclient = New-Object System.Net.WebClient;  $webclient.DownloadFile('http://downloads.puppet.com/windows/puppet-3.7.1.msi','#{win_temp}\\puppet-3.7.1.msi')"])
       end.once
 
       expect(subject).to receive(:install_msi_on).with(winhost_non_cygwin, "#{win_temp}\\puppet-3.7.1.msi", {}, {:debug => nil})
 
-      subject.install_puppet_from_msi( winhost_non_cygwin, {:version => '3.7.1', :win_download_url => 'http://downloads.puppetlabs.com/windows'}   )
+      subject.install_puppet_from_msi( winhost_non_cygwin, {:version => '3.7.1', :win_download_url => 'http://downloads.puppet.com/windows'}   )
     end
   end
 
@@ -544,7 +544,7 @@ describe ClassMixedWithDSLInstallUtils do
           if host != winhost
             allow(subject).to receive(:on).with(host, anything)
           else
-            expect(subject).to receive(:on).with(winhost, "curl -o \"#{win_temp}\\puppet-3.msi\" -O http://downloads.puppetlabs.com/windows/puppet-3.msi")
+            expect(subject).to receive(:on).with(winhost, "curl -o \"#{win_temp}\\puppet-3.msi\" -O http://downloads.puppet.com/windows/puppet-3.msi")
             expect(subject).to receive(:on).with(winhost, " echo 'export PATH=$PATH:\"/cygdrive/c/Program Files (x86)/Puppet Labs/Puppet/bin\":\"/cygdrive/c/Program Files/Puppet Labs/Puppet/bin\"' > /etc/bash.bashrc ")
             expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.msi", {}, {:debug => nil}).exactly(1).times
           end
@@ -556,11 +556,11 @@ describe ClassMixedWithDSLInstallUtils do
           if host != winhost
             allow(subject).to receive(:on).with(host, anything)
           else
-            expect(subject).to receive(:on).with(winhost, "curl -o \"#{win_temp}\\puppet-3.msi\" -O http://nightlies.puppetlabs.com/puppet-latest/repos/windows/puppet-3.msi")
+            expect(subject).to receive(:on).with(winhost, "curl -o \"#{win_temp}\\puppet-3.msi\" -O http://nightlies.puppet.com/puppet-latest/repos/windows/puppet-3.msi")
             expect(subject).to receive(:install_msi_on).with(winhost, "#{win_temp}\\puppet-3.msi", {}, {:debug => nil})
           end
         end
-        subject.install_puppet( :version => '3', :win_download_url => 'http://nightlies.puppetlabs.com/puppet-latest/repos/windows' )
+        subject.install_puppet( :version => '3', :win_download_url => 'http://nightlies.puppet.com/puppet-latest/repos/windows' )
       end
     end
     describe 'on unsupported platforms' do
@@ -873,7 +873,7 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   describe '#msi_link_path' do
-    let( :opts )     { { :puppet_agent_version => 'VERSION', :win_download_url => 'http://downloads.puppetlabs.com/windows' } }
+    let( :opts )     { { :puppet_agent_version => 'VERSION', :win_download_url => 'http://downloads.puppet.com/windows' } }
     let( :platform ) { 'windows' }
     let( :host )     { { :platform => platform, 'dist' => 'puppet-agent-VERSION-x64' } }
 
@@ -894,12 +894,12 @@ describe ClassMixedWithDSLInstallUtils do
 
       expect{
         subject.msi_link_path( host, opts )
-      }.to raise_error(RuntimeError, /Puppet MSI at http:\/\/downloads.puppetlabs.com\/windows\/puppet-agent-VERSION-x64.msi does not exist!/)
+      }.to raise_error(RuntimeError, /Puppet MSI at http:\/\/downloads.puppet.com\/windows\/puppet-agent-VERSION-x64.msi does not exist!/)
     end
   end
 
   describe '#install_puppet_agent_from_msi_on' do
-    let( :opts )     { { :puppet_agent_version => 'VERSION', :win_download_url => 'http://downloads.puppetlabs.com/windows' } }
+    let( :opts )     { { :puppet_agent_version => 'VERSION', :win_download_url => 'http://downloads.puppet.com/windows' } }
     let( :platform ) { 'windows' }
     let( :host )     { { :platform => platform } }
 
@@ -1351,7 +1351,7 @@ describe ClassMixedWithDSLInstallUtils do
     context 'when setting different agent versions' do
       let( :host ) { basic_hosts.first }
       let( :platform ) { Object.new() }
-      let( :downloadurl ) { 'http://pm.puppetlabs.com' }
+      let( :downloadurl ) { 'http://pm.puppet.com' }
       before :each do
         allow( platform ).to receive( :to_array ) { ['el', '6', 'x4'] }
         allow( subject ).to receive( :options ).and_return( opts )
@@ -1365,8 +1365,18 @@ describe ClassMixedWithDSLInstallUtils do
         collection = 'PC1'
         opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}" }
 
-        expect( subject ).to receive( :fetch_http_file ).once.with( /pm\.puppetlabs\.com\/puppet-agent\/.*\/#{agentversion}\/repos/, /puppet-agent-el-6*/, /\/el$/ )
-        expect( host).to receive( :pe_puppet_agent_promoted_package_install ).with( anything, /puppet-agent-el-6*/, /.*\/el\/6\/#{collection}\/.*rpm/, /puppet-agent-el-6/, anything )
+        expect(subject).to receive(:fetch_http_file).once.with(
+          /pm\.puppet\.com\/puppet-agent\/.*\/#{agentversion}\/repos/,
+          /puppet-agent-el-6*/,
+          /\/el$/
+        )
+        expect(host).to receive(:pe_puppet_agent_promoted_package_install).with(
+          anything,
+          /puppet-agent-el-6*/,
+          /.*\/el\/6\/#{collection}\/.*rpm/,
+          /puppet-agent-el-6/,
+          anything
+        )
         subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
       end
 
@@ -1376,8 +1386,17 @@ describe ClassMixedWithDSLInstallUtils do
         collection = 'PC1'
         opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}"}
 
-        expect( subject ).to receive( :fetch_http_file ).once.with( /pm\.puppetlabs\.com\/puppet-agent\/.*\/#{agentversion}\/repos/, /puppet-agent-el-6*/, /\/el$/ )
-        expect( host).to receive( :pe_puppet_agent_promoted_package_install ).with( anything, /puppet-agent-el-6*/, /.*\/el\/6\/#{collection}\/.*rpm/, /puppet-agent-el-6/, anything )
+        expect(subject).to receive(:fetch_http_file).once.with(
+          /pm\.puppet\.com\/puppet-agent\/.*\/#{agentversion}\/repos/,
+          /puppet-agent-el-6*/,/\/el$/
+        )
+        expect(host).to receive(:pe_puppet_agent_promoted_package_install).with(
+          anything,
+          /puppet-agent-el-6*/,
+          /.*\/el\/6\/#{collection}\/.*rpm/,
+          /puppet-agent-el-6/,
+          anything
+        )
         subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
       end
 
@@ -1387,8 +1406,18 @@ describe ClassMixedWithDSLInstallUtils do
         collection = 'puppet5'
         opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}"}
 
-        expect( subject ).to receive( :fetch_http_file ).once.with( /pm\.puppetlabs\.com\/puppet-agent\/.*\/#{agentversion}\/repos/, /puppet-agent-el-6*/, /\/el$/ )
-        expect( host).to receive( :pe_puppet_agent_promoted_package_install ).with( anything, /puppet-agent-el-6*/, /.*\/el\/6\/#{collection}\/.*rpm/, /puppet-agent-el-6/, anything )
+        expect(subject).to receive(:fetch_http_file).once.with(
+          /pm\.puppet\.com\/puppet-agent\/.*\/#{agentversion}\/repos/,
+          /puppet-agent-el-6*/,
+          /\/el$/
+        )
+        expect(host).to receive(:pe_puppet_agent_promoted_package_install).with(
+          anything,
+          /puppet-agent-el-6*/,
+          /.*\/el\/6\/#{collection}\/.*rpm/,
+          /puppet-agent-el-6/,
+          anything
+        )
         subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
       end
 
@@ -1398,8 +1427,18 @@ describe ClassMixedWithDSLInstallUtils do
         collection = 'puppet6'
         opts = { :puppet_agent_version => "#{agentversion}" , :pe_promoted_builds_url => "#{downloadurl}"}
 
-        expect( subject ).to receive( :fetch_http_file ).once.with( /pm\.puppetlabs\.com\/puppet-agent\/.*\/#{agentversion}\/repos/, /puppet-agent-el-6*/, /\/el$/ )
-        expect( host).to receive( :pe_puppet_agent_promoted_package_install ).with( anything, /puppet-agent-el-6*/, /.*\/el\/6\/#{collection}\/.*rpm/, /puppet-agent-el-6/, anything )
+        expect(subject).to receive(:fetch_http_file).once.with(
+          /pm\.puppet\.com\/puppet-agent\/.*\/#{agentversion}\/repos/,
+          /puppet-agent-el-6*/,
+          /\/el$/
+        )
+        expect(host).to receive(:pe_puppet_agent_promoted_package_install).with(
+          anything,
+          /puppet-agent-el-6*/,
+          /.*\/el\/6\/#{collection}\/.*rpm/,
+          /puppet-agent-el-6/,
+          anything
+        )
         subject.install_puppet_agent_pe_promoted_repo_on( host, opts )
       end
     end
@@ -1451,11 +1490,11 @@ describe ClassMixedWithDSLInstallUtils do
   end
 
   describe '#get_latest_puppet_agent_build_from_url' do
-    let(:urls) {['https://downloads.puppetlabs.com/mac/10.9/PC1/x86_64',
-            'https://downloads.puppetlabs.com/mac/10.10/PC1/x86_64',
-            'https://downloads.puppetlabs.com/mac/10.11/PC1/x86_64',
-            'https://downloads.puppetlabs.com/mac/10.12/PC1/x86_64',
-            'https://downloads.puppetlabs.com/windows']}
+    let(:urls) {['https://downloads.puppet.com/mac/10.9/PC1/x86_64',
+            'https://downloads.puppet.com/mac/10.10/PC1/x86_64',
+            'https://downloads.puppet.com/mac/10.11/PC1/x86_64',
+            'https://downloads.puppet.com/mac/10.12/PC1/x86_64',
+            'https://downloads.puppet.com/windows']}
 
     it "gets the right version" do
       urls.each do |url|

data/tasks/ci.rake

@@ -3,6 +3,7 @@ require 'pp'
 require 'yaml'
 require 'securerandom'
 require 'fileutils'
+require 'tempfile'
 require 'beaker-hostgenerator'
 require 'beaker/dsl/install_utils'
 extend Beaker::DSL::InstallUtils
@@ -172,14 +173,28 @@ namespace :ci do
 
   namespace :test do
     desc <<-EOS
-Run the acceptance tests using puppet-agent (AIO) packages.
+Run the acceptance tests using puppet-agent (AIO) packages, with or without
+retrying failed tests one time.
 
   $ SHA=<full sha> bundle exec rake ci:test:aio
 
+or
+
+  $ SHA=<full sha> bundle exec rake ci:test:aio[RETRIES]
+
+
 SHA should be the full SHA for the puppet-agent package.
+
+RETRIES should be set to true to retry failed tests one time. It defaults
+to false.
 EOS
-    task :aio => ['ci:check_env', 'ci:gen_hosts'] do
-      beaker_suite(:aio)
+    task :aio, [:retries] => ['ci:check_env', 'ci:gen_hosts'] do |t, args|
+      args.with_defaults(retries: false)
+      if args[:retries]
+        beaker_suite_retry(:aio)
+      else
+        beaker_suite(:aio)
+      end
     end
 
     desc <<-EOS
@@ -193,11 +208,13 @@ EOS
     task :gem => ['ci:check_env'] do
       beaker(:init, '--hosts', 'config/nodes/gem.yaml', '--options-file', 'config/gem/options.rb')
       beaker(:provision)
-      beaker(:exec, 'pre-suite', '--pre-suite', pre_suites(:gem))
-      beaker(:exec, "#{File.dirname(__dir__)}/setup/gem/010_GemInstall.rb")
-
-      preserve_hosts = ENV['OPTIONS'].include?('--preserve-hosts=always') if ENV['OPTIONS']
-      beaker(:destroy) unless preserve_hosts
+      begin
+        beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(:gem))
+        beaker(:exec, "#{File.dirname(__dir__)}/setup/gem/010_GemInstall.rb")
+      ensure
+        preserve_hosts = ENV['OPTIONS'].include?('--preserve-hosts=always') if ENV['OPTIONS']
+        beaker(:destroy) unless preserve_hosts
+      end
     end
 
     desc <<-EOS
@@ -243,13 +260,40 @@ end
 def beaker_suite(type)
   beaker(:init, '--hosts', ENV['HOSTS'], '--options-file', "config/#{String(type)}/options.rb")
   beaker(:provision)
-  beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(type))
-  beaker(:exec, 'pre-suite', '--preserve-state')
-  beaker(:exec, ENV['TESTS'])
-  beaker(:exec, 'post-suite')
 
-  preserve_hosts = ENV['OPTIONS'].include?('--preserve-hosts=always') if ENV['OPTIONS']
-  beaker(:destroy) unless preserve_hosts
+  begin
+    beaker(:exec, 'pre-suite', '--preserve-state', '--pre-suite', pre_suites(type))
+    beaker(:exec, 'pre-suite', '--preserve-state')
+    beaker(:exec, ENV['TESTS'])
+    beaker(:exec, 'post-suite')
+  ensure
+    preserve_hosts = ENV['OPTIONS'].include?('--preserve-hosts=always') if ENV['OPTIONS']
+    beaker(:destroy) unless preserve_hosts
+  end
+end
+
+def beaker_suite_retry(type)
+  beaker(:init, '--hosts', ENV['HOSTS'], '--options-file', "config/#{String(type)}/options.rb")
+  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(',') )
+    end
+  ensure
+    beaker(:exec, 'post-suite')
+    preserve_hosts = ENV['OPTIONS'].include?('--preserve-hosts=always') if ENV['OPTIONS']
+    beaker(:destroy) unless preserve_hosts
+  end
 end
 
 def pre_suites(type)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-30 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec