beaker-pe 2.11.24 → 2.12.0

data/CODEOWNERS

@@ -1,2 +1,2 @@
-#This Repository is maintained by the release engineering, skeletor, and nimbus teams
-*  @puppetlabs/release-engineering @puppetlabs/skeletor @puppetlabs/nimbus
+#This Repository is maintained by the release engineering, dumpling, skeletor, and nimbus teams
+*  @puppetlabs/release-engineering @puppetlabs/dumpling @puppetlabs/skeletor @puppetlabs/nimbus

data/Gemfile.lock

@@ -0,0 +1,215 @@
+PATH
+  remote: .
+  specs:
+    beaker-pe (2.12.0)
+      beaker (>= 4.0, < 6)
+      beaker-abs
+      beaker-answers (~> 0.0)
+      beaker-puppet (>= 1, < 3)
+      beaker-vmpooler (~> 1.0)
+      stringify-hash (~> 0.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (7.0.4.3)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ansi (1.5.0)
+    ast (2.4.2)
+    bcrypt_pbkdf (1.1.0)
+    beaker (4.40.1)
+      beaker-hostgenerator
+      ed25519 (~> 1.0)
+      hocon (~> 1.0)
+      in-parallel (>= 0.1, < 2)
+      inifile (~> 3.0)
+      minitar (~> 0.6)
+      minitest (~> 5.4)
+      net-scp (>= 1.2, < 5.0)
+      net-ssh (>= 5.0)
+      rexml
+      rsync (~> 1.0.9)
+      stringify-hash (~> 0.0)
+      thor (>= 1.0.1, < 2.0)
+    beaker-abs (0.11.0)
+      bcrypt_pbkdf (>= 1.0, < 2.0)
+      beaker (~> 4.0)
+      ed25519 (>= 1.2, < 2.0)
+      vmfloaty (>= 1.0, < 2)
+    beaker-answers (0.29.0)
+      hocon (~> 1.0)
+      require_all (>= 1.3.2, < 3.1.0)
+      stringify-hash (~> 0.0.0)
+    beaker-hostgenerator (2.2.0)
+      deep_merge (~> 1.0)
+    beaker-puppet (2.0.0)
+      beaker (~> 4.1)
+      oga (~> 3.4)
+    beaker-vmpooler (1.4.0)
+      stringify-hash (~> 0.0.0)
+    coderay (1.1.3)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    concurrent-ruby (1.2.2)
+    daemons (1.4.1)
+    deep_merge (1.2.2)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    ed25519 (1.3.0)
+    eventmachine (1.2.7)
+    fakefs (2.4.0)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    highline (2.0.3)
+    hocon (1.4.0)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    i18n (1.13.0)
+      concurrent-ruby (~> 1.0)
+    in-parallel (1.0.0)
+    inifile (3.0.0)
+    iniparser (1.0.1)
+    json (2.6.3)
+    kramdown (2.4.0)
+      rexml
+    logutils (0.6.1)
+    markdown (1.2.0)
+      kramdown (>= 1.5.0)
+      props (>= 1.1.2)
+      textutils (>= 0.10.0)
+    method_source (1.0.0)
+    minitar (0.9)
+    minitest (5.18.0)
+    multipart-post (2.3.0)
+    net-ldap (0.16.3)
+    net-scp (4.0.0)
+      net-ssh (>= 2.6.5, < 8.0.0)
+    net-ssh (7.1.0)
+    oga (3.4)
+      ast
+      ruby-ll (~> 2.1)
+    power_assert (2.0.3)
+    props (1.2.0)
+      iniparser (>= 0.1.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.7)
+    rake (13.0.6)
+    require_all (3.0.0)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-its (1.3.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rsync (1.0.9)
+    ruby-ll (2.1.2)
+      ansi
+      ast
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    scooter (4.4.0)
+      beaker (~> 4.0)
+      faraday (~> 1.5)
+      faraday-cookie_jar (~> 0.0, >= 0.0.7)
+      faraday_middleware (~> 1.2)
+      json (>= 2.3.0)
+      net-ldap (~> 0.16.0)
+      test-unit
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
+    stringify-hash (0.0.2)
+    test-unit (3.5.7)
+      power_assert
+    textutils (1.4.0)
+      activesupport
+      logutils (>= 0.6.1)
+      props (>= 1.1.2)
+      rubyzip (>= 1.0.0)
+    thin (1.8.2)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    thor (1.2.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.8.2)
+    vmfloaty (1.8.0)
+      commander (>= 4.4.3, < 4.7.0)
+      faraday (~> 1.5, >= 1.5.1)
+    yard (0.9.34)
+
+PLATFORMS
+  aarch64-linux
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  activesupport (~> 7.0)
+  beaker (~> 4.0)
+  beaker-abs (~> 0.8)
+  beaker-pe!
+  beaker-vmpooler (~> 1.3)
+  deep_merge
+  fakefs (~> 2.4, < 2.5.0)
+  markdown
+  pry (~> 0.10)
+  rake (~> 13.0.6)
+  rspec (~> 3.0)
+  rspec-its
+  scooter (~> 4.3)
+  simplecov (= 0.22.0)
+  thin
+  yard
+
+BUNDLED WITH
+   2.4.13

data/README.md

@@ -2,7 +2,17 @@
 
 The Puppet Enterprise (PE) Beaker Library
 
-# What is This Thing?
+- [beaker-pe](#beaker-pe)
+  - [What is This Thing?](#what-is-this-thing)
+  - [Documentation](#documentation)
+  - [Upgrading from 0.y to 1.y?](#upgrading-from-0y-to-1y)
+  - [Gem Installing](#gem-installing)
+  - [Spec Testing](#spec-testing)
+    - [Acceptance Testing](#acceptance-testing)
+  - [Releasing](#releasing)
+  - [Questions](#questions)
+
+## What is This Thing?
 
 The PE Beaker library contains all PE-specific
 
@@ -11,7 +21,7 @@ The PE Beaker library contains all PE-specific
 
 that help someone acceptance test PE easier with Beaker.
 
-# Documentation
+## Documentation
 
 - [Rubydocs](http://www.rubydoc.info/github/puppetlabs/beaker-pe) contain the
 technical reference for APIs and other aspects of beaker-pe. They describe
@@ -21,7 +31,7 @@ of key concepts.
 involved in addressing key problems and use-cases. For instance, checkout our
 [How-to Install Puppet Enterprise doc](docs/how_to/install_puppet_enterprise.md).
 
-# Upgrading from 0.y to 1.y?
+## Upgrading from 0.y to 1.y?
 
 If you've used beaker-pe previously (during the 0.y versions), you'll
 have to change the way that you include beaker-pe for 1.y versions &
@@ -37,46 +47,44 @@ things:
 2. put a `require 'beaker-pe'` statement in your tests/code that need
   beaker-pe-specific functionality
 
-# Gem Installing
+## Gem Installing
+
 Spec tests require a version of scooter that is private. Execute
 `export GEM_SOURCE=https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/` prior to running
 `bundle install --path .bundle/gems/`.
 
-# Spec Testing
+## Spec Testing
 
 Spec tests all live under the `spec` folder.  These are the default rake task, &
 so can be run with a simple `bundle exec rake`, as well as being fully specified
 by running `bundle exec rake test:spec:run` or using the `test:spec` task.
 
-
 There are also code coverage tests built into the template, which can be run
 with spec testing by running the `test:spec:coverage` rake task.
 
-
-## Acceptance Testing
+### Acceptance Testing
 
 Acceptance tests live in the `acceptance/tests` folder.  These are Beaker tests,
 & are dependent on having Beaker installed. Note that this will happen with a
 `bundle install` execution, but can be avoided if you're not looking to run 
 acceptance tests by ignoring the `acceptance_testing` gem group.
 
-
 You can run the acceptance testing suite by invoking the `test:acceptance` rake
 task. It should be noted that this is a shortcut for the `test:acceptance:quick`
 task, which is named as such because it uses no pre-suite.  This uses a default
 provided hosts file for acceptance under the `acceptance/config` directory. If
 you'd like to provide your own hosts file, set the `CONFIG` environment variable.
 
-# Release
+## Releasing
 
-To release new versions, we use a
-[Jenkins job](https://cinext-jenkinsmaster-sre-prod-1.delivery.puppetlabs.net/job/qe_beaker-pe-gem_init-multijob_main/)
-(access to internal infrastructure will be required to view job).
+Open a release prep PR and run the release action:
 
-To release a new version (from the main branch), you'll need to just provide
-a new beaker-pe version number to the job, and you're off to the races.
+1. Bump the "version" parameter in `lib/beaker-pe/version.rb` appropriately based merged pull requests since the last release.
+2. Run `./release-prep` to update `Gemfile.lock` and `CHANGELOG.md`.
+3. Commit and push changes to a new branch, then open a pull request against `main` and be sure to add the "maintenance" label.
+4. After the pull request is approved and merged, then navigate to Actions --> Release Action --> run workflow --> Branch: main --> Run workflow.
 
-# Questions
+## Questions
 
 If you have questions, please reach out to our
 [MAINTAINERS](MAINTAINERS).

data/beaker-pe.gemspec

@@ -20,20 +20,20 @@ Gem::Specification.new do |s|
   # Testing dependencies
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its'
-  s.add_development_dependency 'fakefs', '~> 0.6', '< 0.14.0'
-  s.add_development_dependency 'rake', '~> 12.3.3'
-  s.add_development_dependency 'simplecov', '= 0.18.5'
+  s.add_development_dependency 'fakefs', '~> 2.4', '< 2.5.0'
+  s.add_development_dependency 'rake', '~> 13.0.6'
+  s.add_development_dependency 'simplecov', '= 0.22.0'
   s.add_development_dependency 'pry', '~> 0.10'
 
   # Documentation dependencies
   s.add_development_dependency 'yard'
   s.add_development_dependency 'markdown'
-  s.add_development_dependency 'activesupport', '~> 5.0'
+  s.add_development_dependency 'activesupport', '~> 7.0'
   s.add_development_dependency 'thin'
 
   # Run time dependencies
-  s.add_runtime_dependency 'beaker', '~>4.0'
-  s.add_runtime_dependency 'beaker-puppet', '~>1.0'
+  s.add_runtime_dependency 'beaker', '>= 4.0', '< 6'
+  s.add_runtime_dependency 'beaker-puppet', '>=1', '<3'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
   s.add_runtime_dependency 'beaker-answers', '~> 0.0'
   s.add_runtime_dependency 'beaker-abs'

data/lib/beaker-pe/install/pe_utils.rb

@@ -378,8 +378,8 @@ module Beaker
           local = File.directory?(path)
           filename = "#{host['dist']}"
           if local
-            extension = File.exists?("#{path}/#{filename}.tar.gz") ? ".tar.gz" : ".tar"
-            if not File.exists?("#{path}/#{filename}#{extension}")
+            extension = File.exist?("#{path}/#{filename}.tar.gz") ? ".tar.gz" : ".tar"
+            unless File.exist?("#{path}/#{filename}#{extension}")
               raise "attempting installation on #{host}, #{path}/#{filename}#{extension} does not exist"
             end
             scp_to host, "#{path}/#{filename}#{extension}", "#{host['working_dir']}/#{filename}#{extension}"
@@ -404,16 +404,23 @@ module Beaker
             if host['platform'] =~ /eos/
               host.get_remote_file("#{path}/#{filename}#{extension}")
             else
-              unpack = 'tar -xvf -'
-              unpack = extension =~ /gz/ ? 'gunzip | ' + unpack  : unpack
               if opts[:fetch_local_then_push_to_host]
                 fetch_and_push_pe(host, path, filename, extension)
                 command_file_push = 'cat '
               else
                 curlopts = opts[:use_proxy] ? "--proxy #{opts[:proxy_hostname]}:3128 " : ""
-                command_file_push = "curl -L #{curlopts}#{path}/"
+                command_file_push = "curl --fail --location --output #{filename}#{extension} #{curlopts}#{path}/"
               end
-              on host, "cd #{host['working_dir']}; #{command_file_push}#{filename}#{extension} | #{unpack}"
+
+              retry_requirements = {
+                desired_exit_codes: [0],
+                max_retries: 3,
+                verbose: 'true'
+              }
+              fetch_tarball_command = "cd #{host['working_dir']}; #{command_file_push}#{filename}#{extension}"
+              retry_on(host, fetch_tarball_command, retry_requirements)
+              on host, "cd #{host['working_dir']}; tar -xvf #{filename}#{extension}"
+
               gpg_key_overwrite(host, 'tarball')
             end
           end

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.11.24'
+        STRING = '2.12.0'
       end
 
     end

data/release-prep

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# bundle install
+docker run -it --rm \
+  -v $(pwd):/app \
+  ruby:2.7-slim-bullseye \
+  /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends build-essential git make && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
+
+# Update Changelog
+docker run -it --rm -e CHANGELOG_GITHUB_TOKEN -v $(pwd):/usr/local/src/your-app \
+  githubchangeloggenerator/github-changelog-generator:1.16.2 \
+  github_changelog_generator --future-release $(grep STRING lib/beaker-pe/version.rb |rev |cut -d "'" -f2 |rev)

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -1063,13 +1063,14 @@ describe ClassMixedWithDSLInstallUtils do
   describe 'fetch_pe' do
 
     it 'can push a local PE .tar.gz to a host and unpack it' do
-      allow( File ).to receive( :directory? ).and_return( true ) #is local
-      allow( File ).to receive( :exists? ).and_return( true ) #is a .tar.gz
+      allow( File ).to receive( :directory? ).and_return( true )
+      allow( File ).to receive( :exists? ).and_return( true )
+      allow( File ).to receive( :exist? ).and_return( true )
       unixhost['pe_dir'] = '/local/file/path'
       allow( subject ).to receive( :scp_to ).and_return( true )
 
       path = unixhost['pe_dir']
-      filename = "#{ unixhost['dist'] }"
+      filename = unixhost['dist']
       extension = '.tar.gz'
       expect( subject ).to receive( :scp_to ).with( unixhost, "#{ path }/#{ filename }#{ extension }", "#{ unixhost['working_dir'] }/#{ filename }#{ extension }" ).once
       expect( subject ).to receive( :on ).with( unixhost, /gunzip/ ).once
@@ -1079,61 +1080,69 @@ describe ClassMixedWithDSLInstallUtils do
 
     it 'can download a PE .tar from a URL to a host and unpack it' do
       allow( File ).to receive( :directory? ).and_return( false ) #is not local
-      allow( subject ).to receive( :link_exists? ) do |arg|
-        if arg =~ /.tar.gz/ #there is no .tar.gz link, only a .tar
-          false
-        else
-          true
-        end
-      end
-      allow( subject ).to receive( :on ).and_return( true )
+      allow( subject ).to receive( :link_exists? ) { |arg| arg !~ /.tar.gz/ }
+      zero_exit_code_mock = Object.new
+      allow(zero_exit_code_mock).to receive(:exit_code).and_return(0)
+      allow( subject ).to receive( :on ).and_return( zero_exit_code_mock )
 
+      unixhost['pe_dir'] = '/local/file/path'
       path = unixhost['pe_dir']
-      filename = "#{ unixhost['dist'] }"
+      filename = unixhost['dist']
       extension = '.tar'
-      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl -L #{ path }/#{ filename }#{ extension } | tar -xvf -" ).once
+      expect( subject )
+        .to receive( :on )
+              .with( unixhost, "cd #{ unixhost['working_dir'] }; curl --fail --location --output #{ filename }#{ extension } #{ path }/#{ filename }#{ extension }", anything ).once
       subject.fetch_pe( [unixhost], {} )
     end
 
     it 'can download a PE .tar from a URL to #fetch_and_push_pe' do
-      allow( File ).to receive( :directory? ).and_return( false ) #is not local
-      allow( subject ).to receive( :link_exists? ) do |arg|
-        if arg =~ /.tar.gz/ #there is no .tar.gz link, only a .tar
-          false
-        else
-          true
-        end
-      end
-      allow( subject ).to receive( :on ).and_return( true )
+      allow( File ).to receive( :directory? ).and_return( false )
+      allow( subject ).to receive( :link_exists? ) { |arg| arg !~ /.tar.gz/ }
 
-      filename = "#{ unixhost['dist'] }"
+      zero_exit_code_mock = Object.new
+      allow(zero_exit_code_mock).to receive(:exit_code).and_return(0)
+      allow( subject ).to receive( :on ).and_return( zero_exit_code_mock )
+
+      filename = unixhost['dist']
       extension = '.tar'
-      expect( subject ).to receive( :fetch_and_push_pe ).with( unixhost, anything, filename, extension ).once
-      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; cat #{ filename }#{ extension } | tar -xvf -" ).once
+      expect( subject )
+        .to receive( :fetch_and_push_pe )
+              .with( unixhost, anything, filename, extension ).once
+      expect( subject )
+        .to receive( :on )
+              .with( unixhost, "cd #{ unixhost['working_dir'] }; cat #{ filename }#{ extension }", anything )
+              .once
       subject.fetch_pe( [unixhost], {:fetch_local_then_push_to_host => true} )
     end
 
     it 'can download a PE .tar.gz from a URL to a host and unpack it' do
       allow( File ).to receive( :directory? ).and_return( false ) #is not local
       allow( subject ).to receive( :link_exists? ).and_return( true ) #is a tar.gz
-      allow( subject ).to receive( :on ).and_return( true )
+
+      zero_exit_code_mock = Object.new
+      allow(zero_exit_code_mock).to receive(:exit_code).and_return(0)
+      allow( subject ).to receive( :on ).and_return( zero_exit_code_mock )
 
       path = unixhost['pe_dir']
-      filename = "#{ unixhost['dist'] }"
+      filename = unixhost['dist']
       extension = '.tar.gz'
-      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; curl -L #{ path }/#{ filename }#{ extension } | gunzip | tar -xvf -" ).once
+      expect( subject )
+        .to receive( :on )
+              .with( unixhost, "cd #{ unixhost['working_dir'] }; curl --fail --location --output #{ filename }#{ extension } #{ path }/#{ filename }#{ extension }", anything ).once
       subject.fetch_pe( [unixhost], {} )
     end
 
     it 'can download a PE .tar.gz from a URL to #fetch_and_push_pe' do
-      allow( File ).to receive( :directory? ).and_return( false ) #is not local
-      allow( subject ).to receive( :link_exists? ).and_return( true ) #is a tar.gz
-      allow( subject ).to receive( :on ).and_return( true )
+      allow( File ).to receive( :directory? ).and_return( false )
+      allow( subject ).to receive( :link_exists? ).and_return( true )
+      zero_exit_code_mock = Object.new
+      allow(zero_exit_code_mock).to receive(:exit_code).and_return(0)
+      allow( subject ).to receive( :on ).and_return( zero_exit_code_mock )
 
-      filename = "#{ unixhost['dist'] }"
+      filename = unixhost['dist']
       extension = '.tar.gz'
       expect( subject ).to receive( :fetch_and_push_pe ).with( unixhost, anything, filename, extension ).once
-      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; cat #{ filename }#{ extension } | gunzip | tar -xvf -" ).once
+      expect( subject ).to receive( :on ).with( unixhost, "cd #{ unixhost['working_dir'] }; cat #{ filename }#{ extension }", anything ).once
       subject.fetch_pe( [unixhost], {:fetch_local_then_push_to_host => true} )
     end
 
@@ -1367,7 +1376,7 @@ describe ClassMixedWithDSLInstallUtils do
 
       allow(subject).to receive(:stop_agent_on).and_return(true)
       expect(subject).to receive(:stop_agent_on).with([mono_master, pe_postgres], :run_in_parallel => true).once
-      
+
       allow(subject).to receive(:on).with(mono_master, "puppet agent -t", :acceptable_exit_codes=>[0, 2]).exactly(3).times
       allow(subject).to receive(:on).with(pe_postgres, "puppet agent -t", :acceptable_exit_codes=> [0, 2]).once