beaker-puppet 2.1.0 → 3.0.0

data/lib/beaker-puppet/install_utils/foss_utils.rb

@@ -98,8 +98,8 @@ module Beaker
             git_protocol = 'https://'
           end
 
-          repo = git_server == 'github.com' ? "#{git_fork}/#{project_name}.git" : "#{git_fork}-#{project_name}.git"
-          git_protocol == 'git@' ? "#{git_protocol}#{git_server}:#{repo}" : "#{git_protocol}#{git_server}/#{repo}"
+          repo = (git_server == 'github.com') ? "#{git_fork}/#{project_name}.git" : "#{git_fork}-#{project_name}.git"
+          (git_protocol == 'git@') ? "#{git_protocol}#{git_server}:#{repo}" : "#{git_protocol}#{git_server}/#{repo}"
         end
         alias build_giturl build_git_url
 
@@ -406,7 +406,7 @@ module Beaker
               end
 
               case host['platform']
-              when /el-|redhat|fedora|sles|centos|cisco_/
+              when /amazon|el-|redhat|fedora|sles|centos|cisco_/
                 package_name = 'puppet-agent'
                 package_name << "-#{opts[:puppet_agent_version]}" if opts[:puppet_agent_version]
               when /debian|ubuntu|huaweios/
@@ -993,7 +993,7 @@ module Beaker
             opts = sanitize_opts(opts)
 
             case variant
-            when /^(fedora|el|redhat|centos|sles|cisco_nexus|cisco_ios_xr)$/
+            when /^(amazon|fedora|el|redhat|centos|sles|cisco_nexus|cisco_ios_xr)$/
               variant_url_value = (%w[redhat centos].include?(::Regexp.last_match(1)) ? 'el' : ::Regexp.last_match(1))
               if variant == 'cisco_nexus'
                 variant_url_value = 'cisco-wrlinux'
@@ -1148,7 +1148,7 @@ module Beaker
                                         repo_configs_dir = nil,
                                         opts = options)
           variant, version, arch, codename = host['platform'].to_array
-          if variant !~ /^(amazon|fedora|el|redhat|centos|debian|ubuntu|huaweios|cisco_nexus|cisco_ios_xr|sles)$/
+          if variant !~ /^(fedora|el|redhat|centos|debian|ubuntu|huaweios|cisco_nexus|cisco_ios_xr|sles)$/
             raise "No repository installation step for #{variant} yet..."
           end
 
@@ -1162,7 +1162,7 @@ module Beaker
           # url type
           _, protocol, hostname = opts[:dev_builds_url].partition %r{.*://}
           dev_builds_url = protocol + hostname
-          dev_builds_url = opts[:dev_builds_url] if variant =~ /^(amazon|fedora|el|redhat|centos)$/
+          dev_builds_url = opts[:dev_builds_url] if variant =~ /^(fedora|el|redhat|centos)$/
 
           install_repo_configs(host, dev_builds_url, package_name,
                                build_version, platform_configs_dir)
@@ -1195,193 +1195,6 @@ module Beaker
           configure_type_defaults_on(host)
         end
 
-        # Install development repo of the puppet-agent on the given host(s).  Downloaded from
-        # location of the form DEV_BUILDS_URL/puppet-agent/AGENT_VERSION/repos
-        #
-        # @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. This
-        #                       parameter is used by puppet with the +SUITE_VERSION+ environment
-        #                       variable to provide a `git describe` value to beaker to create a
-        #                       build server URL. Note that +puppet_agent_sha+ will still be used
-        #                       instead of this if a value is provided for that option
-        # @option opts [String] :puppet_agent_sha The sha of puppet-agent to install, defaults to provided
-        #                       puppet_agent_version
-        # @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] :dev_builds_url Base URL to pull artifacts from
-        # @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')
-        #
-        # @note on windows, the +:ruby_arch+ host parameter can determine in addition
-        # to other settings whether the 32 or 64bit install is used
-        #
-        # @example
-        #   install_puppet_agent_dev_repo_on(host, { :puppet_agent_sha => 'd3377feaeac173aada3a2c2cedd141eb610960a7', :puppet_agent_version => '1.1.1.225.gd3377fe'  })
-        #
-        # @return nil
-        def install_puppet_agent_dev_repo_on(hosts, global_opts)
-          global_opts[:puppet_agent_version] ||= global_opts[:version] # backward compatability
-          unless global_opts[:puppet_agent_version]
-            raise 'must provide :puppet_agent_version (puppet-agent version) for install_puppet_agent_dev_repo_on'
-          end
-
-          block_on hosts do |host|
-            opts = global_opts.dup
-
-            # TODO: consolidate these values as they serve no purpose from beaker's side
-            # you could provide any values you could to one to the other
-            puppet_agent_version = opts[:puppet_agent_sha] || opts[:puppet_agent_version]
-
-            opts = sanitize_opts(opts)
-            opts[:download_url] = "#{opts[:dev_builds_url]}/puppet-agent/#{puppet_agent_version}/repos/"
-            opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
-            opts[:puppet_collection]  ||= 'PC1'
-
-            release_path = opts[:download_url]
-
-            variant, version, arch, codename = host['platform'].to_array
-            add_role(host, 'aio') # we are installing agent, so we want aio role
-            copy_dir_local = File.join(opts[:copy_base_local], variant)
-            onhost_copy_base = opts[:copy_dir_external] || host.external_copy_base
-
-            case variant
-            when /^(fedora|el|redhat|centos|debian|ubuntu|huaweios|cisco_nexus|cisco_ios_xr)$/
-              if arch == 's390x' || host['hypervisor'] == 'ec2'
-                logger.trace("#install_puppet_agent_dev_repo_on: unsupported host #{host} for repo detected. using dev package")
-              else
-                install_puppetlabs_dev_repo(host, 'puppet-agent', puppet_agent_version, nil, opts)
-                host.install_package('puppet-agent')
-                logger.trace('#install_puppet_agent_dev_repo_on: install_puppetlabs_dev_repo finished')
-                next
-              end
-            when /^(eos|osx|windows|solaris|sles|aix)$/
-              # Download installer package file & run install manually.
-              # Done below, so that el hosts with s390x arch or on ec2 can use this
-              # workflow as well
-            else
-              raise "No repository installation step for #{variant} yet..."
-            end
-
-            release_path_end, release_file = host.puppet_agent_dev_package_info(
-              opts[:puppet_collection], opts[:puppet_agent_version], opts
-            )
-            release_path << release_path_end
-            logger.trace('#install_puppet_agent_dev_repo_on: dev_package_info, continuing...')
-
-            if variant =~ /eos/
-              host.get_remote_file("#{release_path}/#{release_file}")
-            else
-              onhost_copied_file = File.join(onhost_copy_base, release_file)
-              fetch_http_file(release_path, release_file, copy_dir_local)
-              scp_to host, File.join(copy_dir_local, release_file), onhost_copy_base
-            end
-
-            case variant
-            when /^eos/
-              host.install_from_file(release_file)
-            when /^(sles|aix|fedora|el|redhat|centos)$/
-              # NOTE: AIX does not support repo management. This block assumes
-              # that the desired rpm has been mirrored to the 'repos' location.
-              # NOTE: the AIX 7.1 package will only install on 7.2 with
-              # --ignoreos. This is a bug in package building on AIX 7.1's RPM
-              aix_72_ignoreos_hack = '--ignoreos' if variant == 'aix' && version == '7.2'
-              on host, "rpm -ivh #{aix_72_ignoreos_hack} #{onhost_copied_file}"
-            when /^windows$/
-              result = on host, "echo #{onhost_copied_file}"
-              onhost_copied_file = result.raw_output.chomp
-              msi_opts = { debug: host[:pe_debug] || opts[:pe_debug] }
-              install_msi_on(host, onhost_copied_file, {}, msi_opts)
-            when /^osx$/
-              host.install_package("puppet-agent-#{opts[:puppet_agent_version]}*")
-            when /^solaris$/
-              host.solaris_install_local_package(release_file, onhost_copy_base)
-            end
-            configure_type_defaults_on(host)
-          end
-        end
-        alias install_puppetagent_dev_repo install_puppet_agent_dev_repo_on
-
-        # 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
-        #
-        # @note on windows, the +:ruby_arch+ host parameter can determine in addition
-        #   to other settings whether the 32 or 64bit install is used
-        #
-        # @example
-        #   install_puppet_agent_pe_promoted_repo_on(host, { :puppet_agent_version => '1.1.0.227', :pe_ver => '4.0.0-rc1'})
-        #
-        # @return nil
-        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 =
-              host.pe_puppet_agent_promoted_package_info(
-                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
-              host.pe_puppet_agent_promoted_package_install(
-                onhost_copy_base, onhost_copied_download,
-                onhost_copied_file, download_file, opts
-              )
-            end
-            configure_type_defaults_on(host)
-          end
-        end
-
         # This method will install a pem file certificate on a windows host
         #
         # @param [Host] host                 A host object
@@ -1518,7 +1331,10 @@ module Beaker
             end
 
             # delete any residual files
-            on(host, 'find / -name "*puppet*" -print | xargs rm -rf')
+            result = on(host, 'find / -name "*puppet*" -print | xargs rm -rf', accept_all_exit_codes: true)
+            unless result.exit_code == 0
+              logger.notify("Attempt to clean residual puppet files errored, but can maybe be ignored.\n #{result.stderr}")
+            end
           end
         end
 

data/lib/beaker-puppet/install_utils/puppet_utils.rb

@@ -65,23 +65,6 @@ module Beaker
           end
         end
 
-        # Given an agent_version, return the puppet collection associated with that agent version
-        #
-        # @param [String] agent_version version string or 'latest'
-        # @deprecated This method returns 'PC1' as the latest puppet collection;
-        #     this is incorrect. Use {#puppet_collection_for} instead.
-        def get_puppet_collection(agent_version = 'latest')
-          collection = 'PC1'
-          if agent_version != 'latest'
-            if !version_is_less(agent_version, '5.5.4') and version_is_less(agent_version, '5.99')
-              collection = 'puppet5'
-            elsif !version_is_less(agent_version, '5.99')
-              collection = 'puppet6'
-            end
-          end
-          collection
-        end
-
         # Determine the puppet collection that matches a given package version. The package
         # must be one of
         #   * :puppet_agent (you can get this version from the `aio_agent_version_fact`)

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '2.1.0'
+  VERSION = '3.0.0'
 end

data/release-prep.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# Update Gemfile.lock
+docker run -t --rm \
+  -v $(pwd):/app \
+  ruby:3.1.4 \
+  /bin/bash -c 'apt-get update -qq && apt-get install -y --no-install-recommends git make netbase && cd /app && gem install bundler && bundle install --jobs 3; echo "LOCK_FILE_UPDATE_EXIT_CODE=$?"'
+
+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 VERSION lib/beaker-puppet/version.rb |rev |cut -d "'" -f 2 |rev)

data/setup/aio/010_Install_Puppet_Agent.rb

@@ -1,16 +1,30 @@
 test_name 'Install Puppet Agent Packages' do
-  opts = {
-    nightly_builds_url: ENV.fetch('NIGHTLY_BUILDS_URL', nil),
-    dev_builds_url: ENV.fetch('DEV_BUILDS_URL', nil),
-    puppet_agent_version: ENV.fetch('SHA', nil),
-    puppet_collection: ENV.fetch('RELEASE_STREAM', nil),
-  }
+  agents.each do |agent|
+    path = ENV.fetch('DEV_BUILD_PATH', nil)
+    if path
+      raise ArgumentError, "The path #{path} does not exist" unless File.exist?(path)
+
+      basename = File.basename(path)
+      scp_to(agent, path, basename)
 
-  install_puppet_agent_on(hosts, opts)
+      # configure locations for ruby, puppet, config files, etc
+      add_aio_defaults_on(agent)
+      agent.install_package(basename)
+    else
+      opts = {
+        nightly_builds_url: ENV.fetch('NIGHTLY_BUILDS_URL', nil),
+        dev_builds_url: ENV.fetch('DEV_BUILDS_URL', nil),
+        puppet_agent_version: ENV.fetch('SHA', nil),
+        puppet_collection: ENV.fetch('RELEASE_STREAM', nil),
+      }
+
+      install_puppet_agent_on(hosts, opts)
+    end
+  end
 
   # make sure install is sane, beaker has already added puppet and ruby
   # to PATH in ~/.ssh/environment
-  agents.each do |agent|
+  agents.each do |agent| # rubocop:disable Style/CombinableLoops
     on agent, puppet('--version')
     ruby = ruby_command(agent)
     on agent, "#{ruby} --version"

data/setup/common/040_ValidateSignCert.rb

@@ -7,15 +7,9 @@ test_name 'Validate Sign Cert' do
   skip_test 'not testing with puppetserver' unless @options['is_puppetserver']
   hostname = on(master, 'facter hostname').stdout.strip
   fqdn = on(master, 'facter fqdn').stdout.strip
-  puppet_version = on(master, puppet('--version')).stdout.chomp
 
-  if master.use_service_scripts?
-    step 'Ensure puppet is stopped'
-    # Passenger, in particular, must be shutdown for the cert setup steps to work,
-    # but any running puppet master will interfere with webrick starting up and
-    # potentially ignore the puppet.conf changes.
-    on(master, puppet('resource', 'service', master['puppetservice'], 'ensure=stopped'))
-  end
+  step 'Ensure puppet is stopped'
+  on(master, puppet('resource', 'service', master['puppetservice'], 'ensure=stopped'))
 
   step 'Clear SSL on all hosts'
   hosts.each do |host|
@@ -38,11 +32,10 @@ test_name 'Validate Sign Cert' do
       },
     }
 
-    # In Puppet 6, we want to be using an intermediate CA
-    on master, 'puppetserver ca setup' if !version_is_less(puppet_version, '5.99') && !master['use_existing_container']
+    on(master, 'puppetserver ca setup')
     with_puppet_running_on(master, master_opts) do
       step 'Agents: Run agent --test with autosigning enabled to get cert'
-      on agents, puppet('agent --test'), acceptable_exit_codes: [0, 2]
+      on(agents, puppet('agent --test'), acceptable_exit_codes: [0, 2])
     end
   end
 end

data/setup/gem/010_GemInstall.rb

@@ -19,7 +19,7 @@ agents.each do |agent|
     on(agent, "rm -rf '#{default_dir}'")
 
     arch = agent[:ruby_arch] || 'x86'
-    gem_arch = arch == 'x64' ? 'x64-mingw32' : 'x86-mingw32'
+    gem_arch = (arch == 'x64') ? 'x64-mingw32' : 'x86-mingw32'
     url = "#{base_url}/puppet-#{gem_version}-#{gem_arch}.gem"
   else
     url = "#{base_url}/puppet-#{gem_version}.gem"