beaker-pe 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f0ff78ec64afd7941966459c4af7aa09ec2fe632314a5e31c1c41ede5a9876
-  data.tar.gz: cf2ab7e224f2d468889f97c750b51f655fa35758331fe2d6264baf8afc9e8894
+  metadata.gz: 693f432d697885bac0bbf91ee603bbb005c162bf75c4c27ec0efd6c3c9ecf079
+  data.tar.gz: 04e017e7fdd6622f844f60fa0148eed5b5e7fccf46ca069df40de35a9bd0c571
 SHA512:
-  metadata.gz: 0e9afe28fa995067d31c0aa18189a9728f6f837876b6ebdda59522c4203ae26e4f7047939df45581eaa8dcdb670523f2eab0dbf202720f0a531520e802694a90
-  data.tar.gz: 46d3f8dcfd72fff77f86b57f27ccf91e8c3903185da4059b55f95564109a941b37c7f657b912b8c80c127594394dda32d8b9559b214475db4aa07ea737364021
+  metadata.gz: acc129fb982cc395411397be4bb5c221ca52c04141b59a0409d3920ff44590be01f3f857ae71a88953c80350c279ce23f14938641f9cf9eece4e6c9bbd9d73cf
+  data.tar.gz: 881d008f7f9e436c6efc89b7f6bced1f7c4c1b6dc5b9334470dfb68f60ae1731e9111030dcb0c6b49b1baf3eee861ec16923a80d72d6329efacb605bfe818a0d

data/.github/workflows/release.yml

@@ -36,27 +36,6 @@ 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,5 +1,21 @@
 # Changelog
 
+## [3.0.1](https://github.com/puppetlabs/beaker-pe/tree/3.0.1) (2024-04-08)
+
+[Full Changelog](https://github.com/puppetlabs/beaker-pe/compare/3.0.0...3.0.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 (3.0.0)
+    beaker-pe (3.1.0)
       beaker (>= 4.0, < 6)
       beaker-abs
       beaker-answers (~> 1.0)
-      beaker-puppet (>= 1, < 3)
+      beaker-puppet (>= 1)
       beaker-vmpooler (~> 1.0)
       stringify-hash (~> 0.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.3)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -119,8 +119,8 @@ GEM
       textutils (>= 0.10.0)
     method_source (1.0.0)
     minitar (0.9)
-    minitest (5.21.2)
-    multipart-post (2.3.0)
+    minitest (5.22.2)
+    multipart-post (2.4.0)
     mutex_m (0.2.0)
     net-ldap (0.19.0)
     net-scp (4.0.0)
@@ -135,7 +135,7 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (2.2.8)
+    rack (2.2.8.1)
     rake (13.1.0)
     require_all (3.0.0)
     rexml (3.2.6)
@@ -161,7 +161,7 @@ GEM
       ast
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
-    scooter (4.5.0)
+    scooter (4.5.4)
       beaker
       faraday
       faraday-cookie_jar (>= 0.0.7)
@@ -193,7 +193,7 @@ GEM
     vmfloaty (1.8.1)
       commander (>= 4.4.3, < 4.7.0)
       faraday (~> 1.5, >= 1.5.1)
-    yard (0.9.34)
+    yard (0.9.36)
 
 PLATFORMS
   aarch64-linux
@@ -219,4 +219,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.3.23
+   2.4.22

data/beaker-pe.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
 
   # Run time dependencies
   s.add_runtime_dependency 'beaker', '>= 4.0', '< 6'
-  s.add_runtime_dependency 'beaker-puppet', '>=1', '<3'
+  s.add_runtime_dependency 'beaker-puppet', '>=1'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
   s.add_runtime_dependency 'beaker-answers', '~> 1.0'
   s.add_runtime_dependency 'beaker-abs'

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

@@ -325,6 +325,24 @@ 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
@@ -920,8 +938,12 @@ module Beaker
                 :puppet_collection => host[:puppet_collection] || opts[:puppet_collection],
                 :pe_promoted_builds_url => host[:pe_promoted_builds_url] || opts[:pe_promoted_builds_url]
               }
-              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)
+              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
               # 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 = '3.0.0'
+        STRING = '3.1.0'
       end
 
     end

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

@@ -30,13 +30,14 @@ describe ClassMixedWithDSLInstallUtils do
   let(:basic_hosts)   { make_hosts( { :pe_ver => '3.0',
                                       :platform => 'linux',
                                       :roles => [ 'agent' ],
-                                      :type => 'pe'}, 4 ) }
+                                      :type => 'pe'}, 5 ) }
   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] ] }
+  let(:hosts_sorted)  { [ hosts[1], hosts[0], hosts[2], hosts[3], hosts[4] ] }
   let(:winhost)       { make_host( 'winhost', { :platform => 'windows',
                                                 :pe_ver => '3.0',
                                                 :type => 'pe',
@@ -55,7 +56,10 @@ 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' ],
@@ -1637,8 +1641,30 @@ 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({})
+      expect(subject).to receive(:get_mco_setting).and_return({}).twice
       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: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-07 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -183,9 +183,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -193,9 +190,6 @@ 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
@@ -329,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Beaker PE DSL Helpers!