beaker-puppet 1.27.0 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68502ef5f5e7277b97ce2192ef1d51f571d084e705e98d69f1f4a53e303fcac0
-  data.tar.gz: 3c3c471c33bf0481e6a3d8e44fdaabae4f5efec04377f56a66135d905995c043
+  metadata.gz: 1d22580f573383c2d14f8c340936f3011cd4aa22a3f68c7d3d7e212ee000b5a4
+  data.tar.gz: 43ca75a56533ea39da64b84808c1559ce392b9e9b5cd7ba7bbb019b809a9a875
 SHA512:
-  metadata.gz: 036c6489dd3157d13fb07123dfc27dba5bf7ef1e6ac488f8230942072057a01fd9f32a36922747fc8e656562ffc88f967e0c54f7b4ca15dab9ba4ae6c2ce88dc
-  data.tar.gz: bca6b6878ed42eb9126af029381df3144c5c7e540ffafc07031c14d478e34212256ccf56dd4b9972852ef0f894616b7c1ed95e8b2c7a3f31587a223abbad03e5
+  metadata.gz: c272d6d40f9050bbef35f36db0972e6e6becc53af61b0870b2b8b53756ad83a68e9e4a761dc91835056c7ac3a3e46348aad35fb7aab06db4cbaea4a2314ca7ff
+  data.tar.gz: 189fd8c32eb885429d14cfa146687619610ef40460e6f6e7fb4f5553d1673574ba0bc9c53fa06cb77cbc9209b1e03ab9d9ca9bbbf29061efa8474f6fa7d671c3

data/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.29.0](https://github.com/voxpupuli/beaker-puppet/tree/1.29.0) (2022-11-02)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.28.0...1.29.0)
+
+**Implemented enhancements:**
+
+- Introduce BEAKER\_PUPPET\_DEBUG env var [\#197](https://github.com/voxpupuli/beaker-puppet/pull/197) ([ekohl](https://github.com/ekohl))
+
+**Fixed bugs:**
+
+- \(maint\) Fix DigiCert root cert to match fully patched Solaris 11.4 [\#202](https://github.com/voxpupuli/beaker-puppet/pull/202) ([yachub](https://github.com/yachub))
+
+**Merged pull requests:**
+
+- \(maint\) Uses RFC 5737 IP space in example [\#200](https://github.com/voxpupuli/beaker-puppet/pull/200) ([mhashizume](https://github.com/mhashizume))
+
+## [1.28.0](https://github.com/voxpupuli/beaker-puppet/tree/1.28.0) (2022-09-08)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-puppet/compare/1.27.0...1.28.0)
+
+**Implemented enhancements:**
+
+- \(PA-4552\) Create ci:test:setup step for iterative workflow [\#194](https://github.com/voxpupuli/beaker-puppet/pull/194) ([joshcooper](https://github.com/joshcooper))
+
 ## [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)
@@ -14,6 +38,10 @@ All notable changes to this project will be documented in this file.
 
 - \(PA-4566\) Retry beaker exec if presuite completes [\#195](https://github.com/voxpupuli/beaker-puppet/pull/195) ([joshcooper](https://github.com/joshcooper))
 
+**Merged pull requests:**
+
+- Release 1.27.0 [\#199](https://github.com/voxpupuli/beaker-puppet/pull/199) ([mhashizume](https://github.com/mhashizume))
+
 ## [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)

data/README.md

@@ -41,6 +41,23 @@ require 'beaker-puppet'
 Doing this will include (automatically) the beaker-puppet DSL methods in the
 beaker DSL. Then you can call beaker-puppet methods, exactly as you did before.
 
+## Running Puppet in debug mode
+
+When using `apply_manifest` to run Puppet, it is common that you need debug
+output. To achieve this, the debug option can be passed.
+
+```ruby
+apply_manifest_on(host, manifest, { debug: true })
+```
+
+This has the downside that Puppet always runs in debug mode, which is very
+verbose. Of course you can modify the spec, but that's tedious. An easier
+alternative is to use the environment variable `BEAKER_PUPPET_DEBUG`.
+
+```sh
+BEAKER_PUPPET_DEBUG=1 rspec spec/acceptance/my_spec.rb
+```
+
 # How Do I Test This?
 
 ### Unit / Spec Testing

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

@@ -459,7 +459,7 @@ module Beaker
             on_options[:acceptable_exit_codes] = Array(opts[:acceptable_exit_codes])
 
             puppet_apply_opts = {}
-            if opts[:debug]
+            if opts[:debug] || ENV['BEAKER_PUPPET_DEBUG']
               puppet_apply_opts[:debug] = nil
             else
               puppet_apply_opts[:verbose] = nil

data/lib/beaker-puppet/version.rb

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

data/setup/common/003_solaris_cert_fix.rb

@@ -72,10 +72,10 @@ EOM
 
 hosts.each do |host|
   next unless host.platform =~ /solaris-11(\.2)?-(i386|sparc)/ 
-  create_remote_file(host, "DigiCertTrustedRootG4.crt.pem", DigiCert)
-  on(host, 'chmod a+r /root/DigiCertTrustedRootG4.crt.pem')
-  on(host, 'cp -p /root/DigiCertTrustedRootG4.crt.pem /etc/certs/CA/')
-  on(host, 'rm /root/DigiCertTrustedRootG4.crt.pem')
+  create_remote_file(host, "DigiCert_Trusted_Root_G4.pem", DigiCert)
+  on(host, 'chmod a+r /root/DigiCert_Trusted_Root_G4.pem')
+  on(host, 'cp -p /root/DigiCert_Trusted_Root_G4.pem /etc/certs/CA/')
+  on(host, 'rm /root/DigiCert_Trusted_Root_G4.pem')
 
   if host.platform=~ /solaris-11-sparc/
     create_remote_file(host, "USERTrust_RSA_Certification_Authority.pem", USERTrust)

data/tasks/ci.rake

@@ -25,6 +25,7 @@ Usage: bundle exec rake <target> [arguments]
 
 where <target> is one of:
 
+  ci:test:setup
   ci:test:git
   ci:test:aio
   ci:test:gem
@@ -109,8 +110,8 @@ SERVER:
 
 $project_SERVER:
     Similar to SERVER, but project specific. If you have only one project (i.e., hiera) that you
-    want to pull from a different server then all the others, you could set HIERA_SERVER=179.0.0.1,
-    and you would get back 'https://179.0.0.1/puppetlabs-hiera.git'.
+    want to pull from a different server then all the others, you could set HIERA_SERVER=192.0.2.1,
+    and you would get back 'https://192.0.2.1/puppetlabs-hiera.git'.
 
 RUNTIME_BRANCH:
     Currently only used with git-based testing. This must correspond to a branch in the
@@ -126,11 +127,22 @@ namespace :ci do
   end
 
   task :check_env do
-    if ENV['SHA'].nil?
+    sha = ENV['SHA']
+    case sha
+    when /^\d+\.\d+\.\d+$/
+      # tags are ok
+    when /^[0-9a-f]{40}$/
+      # full SHAs are ok
+    when nil
       puts "Error: A SHA must be specified"
       puts "\n"
       puts USAGE
       exit 1
+    else
+      puts "Error: Expected SHA to be a tag or 40 digit SHA, not '#{sha}'"
+      puts "\n"
+      puts USAGE
+      exit 1
     end
 
     if ENV['TESTS'].nil?
@@ -205,6 +217,35 @@ EOS
       end
     end
 
+    desc <<-EOS
+Setup acceptance tests using puppet-agent (AIO) packages.
+
+  $ SHA=<tag or full sha> HOSTS=<hosts> bundle exec rake ci:test:setup
+
+SHA should be the tag or full SHA for the puppet-agent package.
+
+HOSTS can be a beaker-hostgenerator string or existing file.
+EOS
+    task :setup => ['ci:check_env'] do |t, args|
+      unless ENV['HOSTS']
+        case File.basename(Dir.pwd.sub(/\/acceptance$/, ''))
+        when 'pxp-agent', 'puppet'
+          ENV['HOSTS'] ||= 'redhat7-64m-redhat7-64a'
+        else
+          ENV['HOSTS'] ||= 'redhat7-64a'
+        end
+      end
+
+      Rake::Task[:'ci:gen_hosts'].invoke('abs')
+      beaker_setup(:aio)
+      puts "\nSetup completed on:"
+      YAML.load_file('.beaker/subcommand_options.yaml').fetch('HOSTS', {}).each_pair do |hostname, data|
+        roles = data.fetch('roles', []).join(', ')
+        puts "- #{hostname} (#{roles})"
+      end
+      puts "\nRun 'bundle exec beaker exec <path>' where <path> is a directory or comma-separated list of tests."
+    end
+
     desc <<-EOS
 Run the acceptance tests against puppet gem on various platforms, performing a
 basic smoke test.
@@ -265,6 +306,13 @@ def beaker(command, *argv)
   sh('beaker', command.to_s, *argv)
 end
 
+def beaker_setup(type)
+  beaker(:init, '--hosts', ENV['HOSTS'], '--preserve-hosts', 'always', '--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')
+end
+
 def beaker_suite(type)
   beaker(:init, '--hosts', ENV['HOSTS'], '--options-file', "config/#{String(type)}/options.rb")
   beaker(:provision)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.27.0
+  version: 1.29.0
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec