beaker-puppet 1.18.5 → 1.18.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57be5efb59aee0430bf66e044060bf40b80c9968
-  data.tar.gz: 73cde86bd49873032acf32958f47b0daf2462180
+  metadata.gz: b5a08dd203761a4a5bfda53b7f212ab54fef8d70
+  data.tar.gz: 21f83faf1e52fc7040c76775249469d4eaf52628
 SHA512:
-  metadata.gz: a9d3adce8d72fb265f00236c1a27096c93499bd263a92f8f29ccc14997822a7df87928264d456ba7afa8d93b0d991574dfb7451cdf875f3b4b5797a8263ca144
-  data.tar.gz: 86fdee61a64f18e9dddaa163dd40d93d582a0cd37f04ab01ae3a668c5e90e4ac3f19031f62c04ddbbc74a9264bd85a8878851bc2f15a674d80c60be1336cc4f0
+  metadata.gz: 5995a15e365daa5b940263c03df81ea3c4302b7a2a513cafea25cdeaffb408e17fd70ea3c7213443f53b2b7ec7fdf0ab08aa1712100e3c488022cd55327f5082
+  data.tar.gz: b256f4840bd77c43cb660e79422ffa6291f55216bab327db13959d6e4e30a8ee3bde35ca886481a5068d8b7db70b83d219f4cf679bcd91c71bf01c6d9f5245bc

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.18.5'
+  VERSION = '1.18.6'
 end

data/setup/common/011_Install_Puppet_Server.rb

@@ -7,5 +7,7 @@ test_name "Install Puppet Server" do
     :nightly_builds_url => ENV['NIGHTLY_BUILDS_URL'],
     :dev_builds_url => ENV['DEV_BUILDS_URL']
   }
-  install_puppetserver_on(master, opts)
+  unless master['use_existing_container']
+    install_puppetserver_on(master, opts)
+  end
 end

data/setup/common/040_ValidateSignCert.rb

@@ -1,4 +1,9 @@
 test_name "Validate Sign Cert" do
+  need_to_run = false
+  hosts.each do |host|
+    need_to_run ||= !host['use_existing_container']
+  end
+  skip_test 'No new hosts to create, skipping' unless need_to_run
   skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
   hostname = on(master, 'facter hostname').stdout.strip
   fqdn = on(master, 'facter fqdn').stdout.strip
@@ -35,7 +40,7 @@ test_name "Validate Sign Cert" do
 
     # In Puppet 6, we want to be using an intermediate CA
     unless version_is_less(puppet_version, "5.99")
-      on master, 'puppetserver ca setup'
+      on master, 'puppetserver ca setup' unless master['use_existing_container']
     end
     with_puppet_running_on(master, master_opts) do
       step "Agents: Run agent --test with autosigning enabled to get cert"

data/setup/git/000_EnvSetup.rb

@@ -72,6 +72,14 @@ end
 install_packages_on(agents, PACKAGES, :check_if_exists => true)
 
 step "Unpack puppet-runtime" do
+  need_to_run = false
+  agents.each do |host|
+    # we only need to unpack the runtime if the host doesn't already have runtime
+    # and if it's a not an existing container
+    need_to_run ||= (!host['has_runtime'] && !host['use_existing_container'])
+  end
+
+  skip_test 'No new hosts to create, skipping' unless need_to_run
   dev_builds_url = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
   branch = ENV['RUNTIME_BRANCH'] || 'master'
 
@@ -87,6 +95,7 @@ step "Unpack puppet-runtime" do
   runtime_suffix = ".tar.gz"
 
   agents.each do |host|
+    next if host['has_runtime'] || host['use_existing_container']
 
     platform_tag = host['packaging_platform']
     if platform_tag =~ /windows/

data/setup/git/020_PuppetUserAndGroup.rb

@@ -1,5 +1,6 @@
 test_name 'Puppet User and Group' do
   hosts.each do |host|
+    next if host['use_existing_container']
     step "ensure puppet user and group added to all nodes because this is what the packages do" do
       on host, puppet("resource user puppet ensure=present")
     end

data/setup/git/070_InstallCACerts.rb

@@ -76,6 +76,8 @@ A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
 EOM
 
 hosts.each do |host|
+  next if host['use_existing_container']
+
   step "Installing Geotrust CA cert"
   create_remote_file(host, "geotrustglobal.pem", GEOTRUST_GLOBAL_CA)
   on host, "chmod 644 geotrustglobal.pem"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.18.5
+  version: 1.18.6
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec