beaker-pe 2.16.1 → 2.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52bc9c52ef4e5ca4a1dc4e0c92dde1369ad90e50e075b643a75ecf90646d3312
-  data.tar.gz: f2b0073bc2a1823e975eb185ca22b79af5ca174e74fe0d8249341c8b40db97b2
+  metadata.gz: 91b77453890c3f2af4eecb5a655e069e902d6061ca8724b7bee3c14de7d7c584
+  data.tar.gz: e5675b005b3061014800b7dbc1a49576ed9c561de139db7dd84ea57770c756f6
 SHA512:
-  metadata.gz: 5f486788d637cfe5618b679106dd4b58e484140573febd086fc34a69689503ea24a1976f0ac3d611214b2c600ba9cb43e6c29e10dc928e92cb14c10e569a3e43
-  data.tar.gz: 1639bef650aaf36093bc393697a3d3a0c82e93ca67e98eae8b6fa8ddcead96c2dc3d5c38bdda548d3725eeebf15d8200596cf00235b73dc241468cd850671218
+  metadata.gz: 39fb9fa81be0a7f5fb6970086ded2dd2104c8c68a81b31cc34c31b62a0199d7772089c207f3c495318b5d5526bba13b4a69666a14ff9430354067f8ed20f059e
+  data.tar.gz: 8f65cad0d0e2657594e55ba0ca5cf36af231f2451ea281d51e62fa4d42ec6a3988f234c874a3a5cb6badffa02a6aab29a2279dbd656d725999efc1eb2ef2627a

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/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    beaker-pe (2.16.1)
+    beaker-pe (2.18.0)
       beaker (>= 4.0, < 6)
       beaker-abs
       beaker-answers (~> 0.0)
-      beaker-puppet (>= 1, < 3)
+      beaker-puppet (>= 1)
       beaker-vmpooler (~> 1.0)
       stringify-hash (~> 0.0.0)
 

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', '~> 0.0'
   s.add_runtime_dependency 'beaker-abs'

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

@@ -891,6 +891,231 @@ module Beaker
           end
         end
 
+        # Gets host-specific information for PE promoted puppet-agent packages (Mac version)
+        #
+        # @param [Host] host
+        # @param [String] puppet_collection Name of the puppet collection to use
+        # @param [Hash{Symbol=>String}] opts Options hash to provide extra values
+        #
+        # @return [String, String, String] Host-specific information for packages
+        #   1. release_path_end Suffix for the release_path. Used on Windows. Check
+        #   {Windows::Pkg#pe_puppet_agent_promoted_package_info} to see usage.
+        #   2. release_file Path to the file on release build servers
+        #   3. download_file Filename for the package itself
+        def pe_puppet_agent_promoted_package_info_mac(host, puppet_collection = nil, opts = {} )
+          error_message = "Must provide %s argument to get puppet agent dev package information"
+          raise ArgumentError, error_message % "puppet_collection" unless puppet_collection
+
+          variant, version, arch, _codename = host['platform'].to_array
+          release_file = "/repos/apple/#{version}/#{puppet_collection}/#{arch}/puppet-agent-*"
+
+          # macOS puppet-agent tarballs haven't always included arch
+          agent_version = opts[:puppet_agent_version]
+          agent_version_f = agent_version&.to_f
+
+          download_file = if agent_version_f.nil? || (agent_version_f < 6.28 || (agent_version_f >= 7.0 && agent_version_f < 7.18))
+                            "puppet-agent-#{variant}-#{version}.tar.gz"
+                          else
+                            "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
+                          end
+
+          return '', release_file, download_file
+        end
+
+        # Gets host-specific information for PE promoted puppet-agent packages (Windows version)
+        #
+        # @param [Host] host
+        # @param [String] puppet_collection Name of the puppet collection to use
+        # @param [Hash{Symbol=>String}] opts Options hash to provide extra values
+        #
+        # @return [String, String, String] Host-specific information for packages
+        #   1. release_path_end Suffix for the release_path
+        #   2. release_file Path to the file on release build servers
+        #   3. download_file Filename for the package itself
+        def pe_puppet_agent_promoted_package_info_windows(host, _puppet_collection = nil, _opts = {} )
+          is_config_32 = host['ruby_arch'] == 'x86' || host['install_32'] || host['install_32']
+          should_install_64bit = host.is_x86_64? && !is_config_32
+          # only install 64bit builds if
+          # - we do not have install_32 set on host
+          # - we do not have install_32 set globally
+          arch_suffix = should_install_64bit ? '64' : '86'
+          release_path_end = "/windows"
+          release_file = "/puppet-agent-x#{arch_suffix}.msi"
+          download_file = "puppet-agent-x#{arch_suffix}.msi"
+          return release_path_end, release_file, download_file
+        end
+
+        # Gets host-specific information for PE promoted puppet-agent packages (Unix version)
+        #
+        # @param [Host] host
+        # @param [String] puppet_collection Name of the puppet collection to use
+        # @param [Hash{Symbol=>String}] opts Options hash to provide extra values
+        #
+        # @return [String, String, String] Host-specific information for packages
+        #   1. release_path_end Suffix for the release_path. Used on Windows. Check
+        #   {Windows::Pkg#pe_puppet_agent_promoted_package_info} to see usage.
+        #   2. release_file Path to the file on release build servers
+        #   3. download_file Filename for the package itself
+        def pe_puppet_agent_promoted_package_info_unix(host, puppet_collection = nil, _opts = {} )
+          error_message = "Must provide %s argument to get puppet agent dev package information"
+          raise ArgumentError, error_message % "puppet_collection" unless puppet_collection
+
+          variant, version, arch, codename = host['platform'].to_array
+          case variant
+          when /^(fedora|el|centos|redhat|opensuse|sles)$/
+            variant = ((['centos', 'redhat'].include?(variant)) ? 'el' : variant)
+            release_file = "/repos/#{variant}/#{version}/#{puppet_collection}/#{arch}/puppet-agent-*.rpm"
+            download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
+          when /^(debian|ubuntu|cumulus)$/
+            if arch == 'x86_64'
+              arch = 'amd64'
+            end
+            version = version[0,2] + '.' + version[2,2] if (variant.include?('ubuntu') && !version.include?("."))
+            release_file = "/repos/apt/#{codename}/pool/#{puppet_collection}/p/puppet-agent/puppet-agent*#{arch}.deb"
+            download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
+          when /^solaris$/
+            if arch == 'x86_64'
+              arch = 'i386'
+            end
+            release_file = "/repos/solaris/#{version}/#{puppet_collection}/"
+            download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
+          else
+            raise "No pe-promoted installation step for #{variant} yet..."
+          end
+          return '', release_file, download_file
+        end
+
+        def pe_puppet_agent_promoted_package_install_dispatch(host, onhost_copy_base, onhost_copied_download, onhost_copied_file, download_file, _opts)
+          case host
+          when Mac::Host
+            return pe_puppet_agent_promoted_package_install_mac(host, onhost_copy_base, onhost_copied_download, onhost_copied_file, download_file, _opts)
+          when Unix::Host
+            return pe_puppet_agent_promoted_package_install_unix(host, onhost_copy_base, onhost_copied_download, onhost_copied_file, download_file, _opts)
+          end
+          raise RuntimeError("#{host.class} not one of Beaker::(Mac|Unix)::Host")
+        end
+
+        # Installs a given PE promoted package on a Mac host
+        #
+        # @param [Host] host Host to install package on
+        # @param [String] onhost_copy_base Base copy directory on the host
+        # @param [String] onhost_copied_download Downloaded file path on the host
+        # @param [String] onhost_copied_file Copied file path once un-compressed
+        # @param [String] download_file File name of the downloaded file
+        # @param [Hash{Symbol=>String}] opts additional options
+        #
+        # @return nil
+        def pe_puppet_agent_promoted_package_install_mac(
+              host, onhost_copy_base, onhost_copied_download, onhost_copied_file, _download_file, _opts
+            )
+          host.execute("tar -zxvf #{onhost_copied_download} -C #{onhost_copy_base}")
+          # move to better location
+          host.execute("mv #{onhost_copied_file}.dmg .")
+          host.install_package("puppet-agent-*")
+        end
+
+
+        # Installs a given PE promoted package on a Unix host
+        #
+        # @param [Host] host Host to install package on
+        # @param [String] onhost_copy_base Base copy directory on the host
+        # @param [String] onhost_copied_download Downloaded file path on the host
+        # @param [String] onhost_copied_file Copied file path once un-compressed
+        # @param [String] download_file File name of the downloaded file
+        # @param [Hash{Symbol=>String}] opts additional options
+        #
+        # @return nil
+        def pe_puppet_agent_promoted_package_install_unix(
+              host, onhost_copy_base, onhost_copied_download, onhost_copied_file, download_file, _opts
+            )
+          host.uncompress_local_tarball(onhost_copied_download, onhost_copy_base, download_file )
+          if /^solaris/.match?(host['platform'])
+            # above uncompresses the install from .tar.gz -> .p5p into the
+            # onhost_copied_file directory w/a weird name. We have to read that file
+            # name from the filesystem, so that we can provide it to install_local...
+            pkg_filename = host.execute( "ls #{onhost_copied_file}" )
+            onhost_copied_file = "#{onhost_copied_file}#{pkg_filename}"
+          end
+
+          host.install_local_package(onhost_copied_file, onhost_copy_base )
+          nil
+        end
+
+        def pe_puppet_agent_promoted_package_info_dispatch(host, puppet_collection = nil, opts = {})
+          case host
+          when Windows::Host
+            return pe_puppet_agent_promoted_package_info_windows(host, puppet_collection, opts)
+          when Mac::Host
+            return pe_puppet_agent_promoted_package_info_mac(host, puppet_collection, opts)
+          when Unix::Host
+            return pe_puppet_agent_promoted_package_info_unix(host, puppet_collection, opts)
+          end
+          raise RuntimeError("#{host.class} not one of Beaker::(Windows|Mac|Unix)::Host")
+        end
+
+        # Install shared repo of the puppet-agent on the given host(s).  Downloaded from
+        # location of the form PE_PROMOTED_BUILDS_URL/PE_VER/puppet-agent/AGENT_VERSION/repo
+        #
+        # @param [Host, Array<Host>, String, Symbol] hosts    One or more hosts to act upon,
+        #                            or a role (String or Symbol) that identifies one or more hosts.
+        # @param [Hash{Symbol=>String}] opts An options hash
+        # @option opts [String] :puppet_agent_version The version of puppet-agent to install, defaults to 'latest'
+        # @option opts [String] :pe_ver The version of PE (will also use host['pe_ver']), defaults to '4.0'
+        # @option opts [String] :copy_base_local Directory where puppet-agent artifact
+        #                       will be stored locally
+        #                       (default: 'tmp/repo_configs')
+        # @option opts [String] :copy_dir_external Directory where puppet-agent
+        #                       artifact will be pushed to on the external machine
+        #                       (default: '/root')
+        # @option opts [String] :puppet_collection Defaults to 'PC1'
+        # @option opts [String] :pe_promoted_builds_url Base URL to pull artifacts from
+        def install_puppet_agent_pe_promoted_repo_on(hosts, opts)
+          opts[:puppet_agent_version] ||= 'latest'
+
+          block_on hosts do |host|
+            pe_ver = host[:pe_ver] || opts[:pe_ver] || '4.0.0-rc1'
+            opts = sanitize_opts(opts)
+            opts[:download_url] =
+              "#{opts[:pe_promoted_builds_url]}/puppet-agent/#{pe_ver}/#{opts[:puppet_agent_version]}/repos"
+            opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
+            opts[:copy_dir_external]  ||= host.external_copy_base
+            opts[:puppet_collection] ||= puppet_collection_for(:puppet_agent, opts[:puppet_agent_version])
+            add_role(host, 'aio') # we are installing agent, so we want aio role
+            release_path = opts[:download_url]
+            variant, version, arch, codename = host['platform'].to_array
+            copy_dir_local = File.join(opts[:copy_base_local], variant)
+            onhost_copy_base = opts[:copy_dir_external]
+
+            release_path_end, release_file, download_file =
+            pe_puppet_agent_promoted_package_info_dispatch(
+              host,
+              opts[:puppet_collection], opts
+            )
+            release_path << release_path_end
+
+            onhost_copied_download = File.join(onhost_copy_base, download_file)
+            onhost_copied_file = File.join(onhost_copy_base, release_file)
+            fetch_http_file(release_path, download_file, copy_dir_local)
+            scp_to host, File.join(copy_dir_local, download_file), onhost_copy_base
+
+            if variant == 'windows'
+              result = on host, "echo #{onhost_copied_file}"
+              onhost_copied_file = result.raw_output.chomp
+              opts = { debug: host[:pe_debug] || opts[:pe_debug] }
+              # couldn't pull this out, because it's relying on
+              # {Beaker::DSL::InstallUtils::WindowsUtils} methods,
+              # which I didn't want to attack right now. TODO
+              install_msi_on(host, onhost_copied_file, {}, opts)
+            else
+              pe_puppet_agent_promoted_package_install_dispatch(
+                host,
+                onhost_copy_base, onhost_copied_download,
+                onhost_copied_file, download_file, opts
+              )
+            end
+            configure_type_defaults_on(host)
+          end
+        end
 
         def generic_install hosts, opts = {}
           step "Installing PE on a generic set of hosts"

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '2.16.1'
+        STRING = '2.18.0'
       end
 
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 2.16.1
+  version: 2.18.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-04 00:00:00.000000000 Z
+date: 2024-06-12 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!