beaker-pe 2.17.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0efb01c083ddc9e7947698d848ab5fc7678f72b9c59355baaada7298a43e13c
-  data.tar.gz: 4a7a4866472779a03ef8c76fdeffb4a58dd8c01c6164f43542b8f14020b533d7
+  metadata.gz: e9f0ff78ec64afd7941966459c4af7aa09ec2fe632314a5e31c1c41ede5a9876
+  data.tar.gz: cf2ab7e224f2d468889f97c750b51f655fa35758331fe2d6264baf8afc9e8894
 SHA512:
-  metadata.gz: 7457fa9aff61c825c607c24159a46cbe42351222dfb891cbc2d30799805aa8a7a4074b409f7692d7fa2d8e8aa2351584b3637a302a81931e359ca31231316e10
-  data.tar.gz: d48ab5a2148e9e9cf2dcc081b4d18b9d004c53c4101f98da9e786bac0b7ef8bb487687e81ed76ed75e0f07d2c402c65b2bd356740df0c25db1848ac2082afa5b
+  metadata.gz: 0e9afe28fa995067d31c0aa18189a9728f6f837876b6ebdda59522c4203ae26e4f7047939df45581eaa8dcdb670523f2eab0dbf202720f0a531520e802694a90
+  data.tar.gz: 46d3f8dcfd72fff77f86b57f27ccf91e8c3903185da4059b55f95564109a941b37c7f657b912b8c80c127594394dda32d8b9559b214475db4aa07ea737364021

data/.github/workflows/release.yml

@@ -36,6 +36,27 @@ jobs:
           return response.tag_name
         result-encoding: string
 
+    - name: Generate Changelog
+      uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
+      with:
+        args: >-
+          --future-release ${{ steps.nv.outputs.version }}
+      env:
+        CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Validate Changelog
+      run : |
+        set -e
+        if output=$(git status --porcelain) && [ ! -z "$output" ]; then
+          echo "Here is the current git status:"
+          git status
+          echo
+          echo "The following changes were detected:"
+          git --no-pager diff
+          echo "Uncommitted PRs found in the changelog. Please submit a release prep PR of changes after running './release-prep'"
+          exit 1
+        fi
+
     - name: Generate Release Notes
       uses: docker://githubchangeloggenerator/github-changelog-generator:1.16.2
       with:

data/CHANGELOG.md

@@ -1,21 +1,5 @@
 # Changelog
 
-## [2.16.1](https://github.com/puppetlabs/beaker-pe/tree/2.16.1) (2024-04-04)
-
-[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.0...2.16.1)
-
-**Implemented enhancements:**
-
-- \(PE-37704\) Allow for SLES-11 \(Intel\) builds to be installed in PE 2021.7.x for testing [\#259](https://github.com/puppetlabs/beaker-pe/pull/259) ([shubhamshinde360](https://github.com/shubhamshinde360))
-
-**Merged pull requests:**
-
-- Bump yard from 0.9.35 to 0.9.36 [\#258](https://github.com/puppetlabs/beaker-pe/pull/258) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump rack from 2.2.8 to 2.2.8.1 [\#257](https://github.com/puppetlabs/beaker-pe/pull/257) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump yard from 0.9.34 to 0.9.35 [\#256](https://github.com/puppetlabs/beaker-pe/pull/256) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump activesupport from 7.1.3 to 7.1.3.2 [\#255](https://github.com/puppetlabs/beaker-pe/pull/255) ([dependabot[bot]](https://github.com/apps/dependabot))
-- Bump scooter from 4.5.0 to 4.5.4 [\#254](https://github.com/puppetlabs/beaker-pe/pull/254) ([dependabot[bot]](https://github.com/apps/dependabot))
-
 ## [3.0.0](https://github.com/puppetlabs/beaker-pe/tree/3.0.0) (2024-02-07)
 
 [Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/2.16.0...3.0.0)

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    beaker-pe (2.17.0)
+    beaker-pe (3.0.0)
       beaker (>= 4.0, < 6)
       beaker-abs
-      beaker-answers (~> 0.0)
-      beaker-puppet (>= 1)
+      beaker-answers (~> 1.0)
+      beaker-puppet (>= 1, < 3)
       beaker-vmpooler (~> 1.0)
       stringify-hash (~> 0.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.1)
+    activesupport (7.1.3)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -24,9 +24,9 @@ GEM
       tzinfo (~> 2.0)
     ansi (1.5.0)
     ast (2.4.2)
-    base64 (0.1.1)
+    base64 (0.2.0)
     bcrypt_pbkdf (1.1.0)
-    beaker (4.40.2)
+    beaker (4.41.2)
       beaker-hostgenerator
       ed25519 (~> 1.0)
       hocon (~> 1.0)
@@ -45,30 +45,29 @@ GEM
       beaker (~> 4.0)
       ed25519 (>= 1.2, < 2.0)
       vmfloaty (>= 1.0, < 2)
-    beaker-answers (0.29.0)
+    beaker-answers (1.0.0)
       hocon (~> 1.0)
       require_all (>= 1.3.2, < 3.1.0)
       stringify-hash (~> 0.0.0)
-    beaker-hostgenerator (2.2.3)
+    beaker-hostgenerator (2.9.1)
       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)
-    bigdecimal (3.1.4)
+    bigdecimal (3.1.6)
     coderay (1.1.3)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     daemons (1.4.1)
     deep_merge (1.2.2)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    drb (2.1.1)
+    domain_name (0.6.20240107)
+    drb (2.2.0)
       ruby2_keywords
     ed25519 (1.3.0)
     eventmachine (1.2.7)
@@ -107,10 +106,10 @@ GEM
       domain_name (~> 0.5)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    in-parallel (1.0.0)
+    in-parallel (1.0.1)
     inifile (3.0.0)
     iniparser (1.0.1)
-    json (2.6.3)
+    json (2.7.1)
     kramdown (2.4.0)
       rexml
     logutils (0.6.1)
@@ -120,13 +119,13 @@ GEM
       textutils (>= 0.10.0)
     method_source (1.0.0)
     minitar (0.9)
-    minitest (5.20.0)
+    minitest (5.21.2)
     multipart-post (2.3.0)
-    mutex_m (0.1.2)
-    net-ldap (0.16.3)
+    mutex_m (0.2.0)
+    net-ldap (0.19.0)
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
-    net-ssh (7.2.0)
+    net-ssh (7.2.1)
     oga (3.4)
       ast
       ruby-ll (~> 2.1)
@@ -136,39 +135,39 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.7)
+    rack (2.2.8)
     rake (13.1.0)
     require_all (3.0.0)
     rexml (3.2.6)
-    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)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.0)
     rsync (1.0.9)
-    ruby-ll (2.1.2)
+    ruby-ll (2.1.3)
       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)
+    scooter (4.5.0)
+      beaker
+      faraday
+      faraday-cookie_jar (>= 0.0.7)
       faraday_middleware (~> 1.2)
-      json (>= 2.3.0)
-      net-ldap (~> 0.16.0)
+      json
+      net-ldap (~> 0.16)
       test-unit
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -177,7 +176,7 @@ GEM
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
     stringify-hash (0.0.2)
-    test-unit (3.5.7)
+    test-unit (3.6.1)
       power_assert
     textutils (1.4.0)
       activesupport
@@ -188,13 +187,10 @@ GEM
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (1.2.2)
+    thor (1.3.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8.2)
-    vmfloaty (1.8.0)
+    vmfloaty (1.8.1)
       commander (>= 4.4.3, < 4.7.0)
       faraday (~> 1.5, >= 1.5.1)
     yard (0.9.34)
@@ -223,4 +219,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.4.22
+   2.3.23

data/README.md

@@ -66,7 +66,7 @@ with spec testing by running the `test:spec:coverage` rake task.
 
 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 
+`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
@@ -77,6 +77,11 @@ you'd like to provide your own hosts file, set the `CONFIG` environment variable
 
 ## Releasing
 
+Prerequisites (without these steps you will almost certainly hit API rate limits):
+
+1. Generate [an API token](https://github.com/settings/tokens) with repository permissions and authorize the Puppet organization after generating.
+2. Export that token as `CHANGELOG_GITHUB_TOKEN`
+
 Open a release prep PR and run the release action:
 
 1. Bump the "version" parameter in `lib/beaker-pe/version.rb` appropriately based merged pull requests since the last release.

data/beaker-pe.gemspec

@@ -33,9 +33,9 @@ Gem::Specification.new do |s|
 
   # Run time dependencies
   s.add_runtime_dependency 'beaker', '>= 4.0', '< 6'
-  s.add_runtime_dependency 'beaker-puppet', '>=1'
+  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-answers', '~> 1.0'
   s.add_runtime_dependency 'beaker-abs'
   s.add_runtime_dependency 'beaker-vmpooler', '~> 1.0'
 

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

@@ -325,24 +325,6 @@ module Beaker
           end
         end
 
-        # Determine the build package to download on a sles-11 (Intel) host, install that package onto the host.
-        # Assumed file name format: puppet-agent-7.29.1.26.gf344eeefa-1.sles11.x86_64.rpm.
-        # This method should be called after puppet is installed on the master since it relies on the master
-        # telling it the puppet agent version to form the download URL.
-        # @param [Host] host The sles-11 host to download and install the package on.
-        # @param  [Hash{Symbol=>Symbol, String}] opts The options
-        # @api private
-        def install_rpm_on_sles11_host(host, puppet_agent_ver, opts)
-          # Since sles11 builds are not available in PE, download from agent-downloads.
-          agent_downloads_url = "http://agent-downloads.delivery.puppetlabs.net/puppet-agent"
-          master_aio_version = puppet_fact(master, 'aio_agent_build')
-          stream = opts[:puppet_collection] || "puppet#{puppet_agent_ver[0]}"
-          path = "#{agent_downloads_url}/#{puppet_agent_ver}/repos/sles/11/#{stream}/x86_64"
-          filename = "puppet-agent-#{master_aio_version}-1.sles11.x86_64"
-          extension = ".rpm"
-          host.install_package_with_rpm("#{path}/#{filename}#{extension}")
-        end
- 
         #Determine the PE package to download/upload on a windows host, download/upload that package onto the host.
         #Assumed file name format: puppet-enterprise-3.3.0-rc1-559-g97f0833.msi
         # @param [Host] host The windows host to download/upload and unpack PE onto
@@ -938,12 +920,8 @@ module Beaker
                 :puppet_collection => host[:puppet_collection] || opts[:puppet_collection],
                 :pe_promoted_builds_url => host[:pe_promoted_builds_url] || opts[:pe_promoted_builds_url]
               }
-              if host['platform'] =~ /sles-11/
-                install_rpm_on_sles11_host(host, install_params[:puppet_agent_version], opts)
-              else
-                install_params.delete(:pe_promoted_builds_url) if install_params[:pe_promoted_builds_url].nil?
-                install_puppet_agent_pe_promoted_repo_on(host, install_params)
-              end
+              install_params.delete(:pe_promoted_builds_url) if install_params[:pe_promoted_builds_url].nil?
+              install_puppet_agent_pe_promoted_repo_on(host, install_params)
               # 1 since no certificate found and waitforcert disabled
               acceptable_exit_codes = [0, 1]
               acceptable_exit_codes << 2 if opts[:type] == :upgrade

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.17.0'
+        STRING = '3.0.0'
       end
 
     end

data/release-prep

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
 # bundle install
-docker run -it --rm \
+docker run -t --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 \
+docker run -t --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

@@ -30,14 +30,13 @@ describe ClassMixedWithDSLInstallUtils do
   let(:basic_hosts)   { make_hosts( { :pe_ver => '3.0',
                                       :platform => 'linux',
                                       :roles => [ 'agent' ],
-                                      :type => 'pe'}, 5 ) }
+                                      :type => 'pe'}, 4 ) }
   let(:hosts)         { basic_hosts[0][:roles] = ['master', 'database', 'dashboard']
                         basic_hosts[1][:platform] = 'windows'
                         basic_hosts[2][:platform] = 'osx-10.9-x86_64'
                         basic_hosts[3][:platform] = 'eos'
-                        basic_hosts[4][:platform] = 'sles'
                         basic_hosts  }
-  let(:hosts_sorted)  { [ hosts[1], hosts[0], hosts[2], hosts[3], hosts[4] ] }
+  let(:hosts_sorted)  { [ hosts[1], hosts[0], hosts[2], hosts[3] ] }
   let(:winhost)       { make_host( 'winhost', { :platform => 'windows',
                                                 :pe_ver => '3.0',
                                                 :type => 'pe',
@@ -56,10 +55,7 @@ describe ClassMixedWithDSLInstallUtils do
                                                 :type => 'pe',
                                                 :working_dir => '/tmp',
                                                 :dist => 'puppet-enterprise-3.7.1-rc0-78-gffc958f-eos-4-i386' } ) }
-  let(:sles11host)    { make_host( 'sles11', { :platform => 'sles',
-                                               :pe_ver => '3.0',
-                                               :type => 'pe',
-                                               :working_dir => '/tmp'} ) }
+
   let(:lei_hosts)     { make_hosts( { :pe_ver => '3.0',
                                       :platform => 'linux',
                                       :roles => [ 'agent' ],
@@ -1641,30 +1637,8 @@ describe ClassMixedWithDSLInstallUtils do
       subject.do_install([])
     end
 
-    context "install rpm file in sles host" do
-      let(:opts) {
-        { :puppet_collection => 'puppet7' }
-      }
-      let(:stream) { opts[:puppet_collection] }
-      let(:puppet_agent_ver) { '7.29.1.26' }
-      let(:agent_downloads_url) { "http://agent-downloads.delivery.puppetlabs.net/puppet-agent" }
-      let(:master_version) { '7.29.1.26.gf344eeefa' }
-      let(:path) { "#{agent_downloads_url}/#{puppet_agent_ver}/repos/sles/11/#{stream}/x86_64" }
-      let(:filename) { "puppet-agent-#{master_version}-1.sles11.x86_64" }
-      let(:extension) { '.rpm' }
-      let(:url) { "#{path}/#{filename}#{extension}" }
-  
-      it "generates the correct url to download the package" do
-        allow( subject ).to receive( :puppet_fact ).and_return( master_version )
-        allow( subject ).to receive( :master ).and_return( {} )
-  
-        expect( hosts[4] ).to receive( :install_package_with_rpm ).with( url ).once
-        subject.install_rpm_on_sles11_host(hosts[4], puppet_agent_ver, opts)
-      end
-    end
-
     it 'can perform a simple installation' do
-      expect(subject).to receive(:get_mco_setting).and_return({}).twice
+      expect(subject).to receive(:get_mco_setting).and_return({})
       allow( subject ).to receive( :verify_network_resources).with(hosts, nil)
       allow( subject ).to receive( :on ).and_return( Beaker::Result.new( {}, '' ) )
       allow( subject ).to receive( :fetch_pe ).and_return( true )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.17.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-22 00:00:00.000000000 Z
+date: 2024-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -183,6 +183,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -190,6 +193,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: stringify-hash
   requirement: !ruby/object:Gem::Requirement
@@ -210,14 +216,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: beaker-abs
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +329,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Beaker PE DSL Helpers!