packaging 0.88.77 → 0.99.0

data/lib/packaging/util/ship.rb

@@ -24,14 +24,14 @@ module Pkg::Util::Ship
   #
   # If this is platform_independent the packages will not get reorganized,
   # just copied under the tmp directory for more consistent workflows
-  def reorganize_packages(pkgs, tmp, platform_independent = false, nonfinal = false)
+  def reorganize_packages(pkgs, tmp, platform_independent = false)
     new_pkgs = []
     pkgs.each do |pkg|
       if platform_independent
         path = 'pkg'
       else
         platform_tag = Pkg::Paths.tag_from_artifact_path(pkg)
-        path = Pkg::Paths.artifacts_path(platform_tag, 'pkg', nonfinal)
+        path = Pkg::Paths.artifacts_path(platform_tag, 'pkg')
       end
       FileUtils.mkdir_p File.join(tmp, path)
       FileUtils.cp pkg, File.join(tmp, path)
@@ -64,16 +64,15 @@ module Pkg::Util::Ship
     options = {
       excludes: [],
       chattr: true,
-      platform_independent: false,
-      nonfinal: false }.merge(opts)
+      platform_independent: false }.merge(opts)
 
     # First find the packages to be shipped. We must find them before moving
     # to our temporary staging directory
     local_packages = collect_packages(pkg_exts, options[:excludes])
-    return false if local_packages.empty?
+    return if local_packages.empty?
 
     tmpdir = Dir.mktmpdir
-    staged_pkgs = reorganize_packages(local_packages, tmpdir, options[:platform_independent], options[:nonfinal])
+    staged_pkgs = reorganize_packages(local_packages, tmpdir, options[:platform_independent])
 
     puts staged_pkgs.sort
     puts "Do you want to ship the above files to (#{staging_server})?"
@@ -86,7 +85,7 @@ module Pkg::Util::Ship
           sub_string = 'pkg'
           remote_pkg = pkg.sub(sub_string, remote_path)
           remote_basepath = File.dirname(remote_pkg)
-          Pkg::Util::Net.remote_execute(staging_server, "mkdir -p #{remote_basepath}")
+          Pkg::Util::Net.remote_ssh_cmd(staging_server, "mkdir -p #{remote_basepath}")
           Pkg::Util::Net.rsync_to(
             File.join(tmpdir, pkg),
             staging_server,
@@ -100,77 +99,11 @@ module Pkg::Util::Ship
           Pkg::Util::Net.remote_set_immutable(staging_server, [remote_pkg]) if options[:chattr]
         end
       end
-      return true
     end
   end
 
-  def ship_rpms(local_staging_directory, remote_path, opts = {})
-    things_to_ship = [
-      "#{local_staging_directory}/**/*.rpm",
-      "#{local_staging_directory}/**/*.srpm"
-    ]
-    ship_pkgs(things_to_ship, Pkg::Config.yum_staging_server, remote_path, opts)
-  end
-
-  def ship_debs(local_staging_directory, remote_path, opts = {})
-    things_to_ship = [
-      "#{local_staging_directory}/**/*.debian.tar.gz",
-      "#{local_staging_directory}/**/*.orig.tar.gz",
-      "#{local_staging_directory}/**/*.dsc",
-      "#{local_staging_directory}/**/*.deb",
-      "#{local_staging_directory}/**/*.changes"
-    ]
-    ship_pkgs(things_to_ship, Pkg::Config.apt_signing_server, remote_path, opts)
-  end
-
-  def ship_svr4(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(["#{local_staging_directory}/**/*.pkg.gz"], Pkg::Config.svr4_host, remote_path, opts)
-  end
-
-  def ship_p5p(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(["#{local_staging_directory}/**/*.p5p"], Pkg::Config.p5p_host, remote_path, opts)
-  end
-
-  def ship_dmg(local_staging_directory, remote_path, opts = {})
-    packages_have_shipped = ship_pkgs(["#{local_staging_directory}/**/*.dmg"],
-                                      Pkg::Config.dmg_staging_server, remote_path, opts)
-
-    if packages_have_shipped
-      Pkg::Platforms.platform_tags_for_package_format('dmg').each do |platform_tag|
-        # Create the latest symlink for the current supported repo
-        Pkg::Util::Net.remote_create_latest_symlink(
-          Pkg::Config.project,
-          Pkg::Paths.artifacts_path(platform_tag, remote_path, opts[:nonfinal]),
-          'dmg'
-        )
-      end
-    end
-  end
-
-  def ship_swix(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(["#{local_staging_directory}/**/*.swix"], Pkg::Config.swix_staging_server, remote_path, opts)
-  end
-
-  def ship_msi(local_staging_directory, remote_path, opts = {})
-    packages_have_shipped = ship_pkgs(["#{local_staging_directory}/**/*.msi"], Pkg::Config.msi_staging_server, remote_path, opts)
-
-    if packages_have_shipped
-      # Create the symlinks for the latest supported repo
-      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path, opts[:nonfinal]), 'msi', arch: 'x64')
-      Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path, opts[:nonfinal]), 'msi', arch: 'x86')
-    end
-  end
-
-  def ship_gem(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(["#{local_staging_directory}/*.gem*"], Pkg::Config.gem_host, remote_path, opts)
-  end
-
-  def ship_tar(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(["#{local_staging_directory}/*.tar.gz*"], Pkg::Config.tar_staging_server, remote_path, opts)
-  end
-
-  def rolling_repo_link_command(platform_tag, repo_path, nonfinal = false)
-    base_path, link_path = Pkg::Paths.artifacts_base_path_and_link_path(platform_tag, repo_path, nonfinal)
+  def rolling_repo_link_command(platform_tag, repo_path)
+    base_path, link_path = Pkg::Paths.artifacts_base_path_and_link_path(platform_tag, repo_path)
 
     if link_path.nil?
       puts "No link target set, not creating rolling repo link for #{base_path}"
@@ -199,79 +132,17 @@ module Pkg::Util::Ship
     CMD
   end
 
-  def create_rolling_repo_link(platform_tag, staging_server, repo_path, nonfinal = false)
-    command = rolling_repo_link_command(platform_tag, repo_path, nonfinal)
+  def create_rolling_repo_link(platform_tag, staging_server, repo_path)
+    command = rolling_repo_link_command(platform_tag, repo_path)
 
-    Pkg::Util::Net.remote_execute(staging_server, command) unless command.nil?
+    Pkg::Util::Net.remote_ssh_cmd(staging_server, command) unless command.nil?
   rescue => e
-    fail "Failed to create rolling repo link for '#{platform_tag}'.\n#{e}\n#{e.backtrace}"
-  end
-
-  # create all of the rolling repo links in one step
-  def create_rolling_repo_links(nonfinal = false)
-    yum_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'rpm')
-    dmg_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'dmg')
-    swix_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'swix')
-    msi_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'msi')
-
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('el'), Pkg::Config.yum_staging_server, yum_path, nonfinal)
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('osx'), Pkg::Config.dmg_staging_server, dmg_path, nonfinal)
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('eos'), Pkg::Config.swix_staging_server, swix_path, nonfinal)
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('windows'), Pkg::Config.msi_staging_server, msi_path, nonfinal)
-
-    # We need to iterate through all the supported platforms here because of
-    # how deb repos are set up. Each codename will have its own link from the
-    # current versioned repo (e.g. puppet5) to the rolling repo. The one thing
-    # we don't care about is architecture, so we just grab the first supported
-    # architecture for the code name we're working with at the moment. [written
-    # by Melissa, copied by Molly]
-
-    apt_path = Pkg::Config.apt_repo_staging_path
-    if nonfinal
-      apt_path = Pkg::Config.nonfinal_apt_repo_staging_path
-    end
-    Pkg::Platforms.codenames.each do |codename|
-      create_rolling_repo_link(Pkg::Platforms.codename_to_tags(codename)[0], Pkg::Config.apt_signing_server, apt_path, nonfinal)
-    end
-  end
-
-  def update_release_package_symlinks(local_staging_directory, nonfinal = false)
-    local_packages = collect_packages(["#{local_staging_directory}/**/*.rpm", "#{local_staging_directory}/**/*.deb"])
-    local_packages.each do |package|
-      platform_tag = Pkg::Paths.tag_from_artifact_path(package)
-      package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
-      case package_format
-      when 'rpm'
-        remote_base = Pkg::Paths.artifacts_path(platform_tag, Pkg::Paths.remote_repo_base(platform_tag, nonfinal: nonfinal), nonfinal)
-      when 'deb'
-        remote_base = Pkg::Paths.apt_package_base_path(platform_tag, Pkg::Paths.repo_name(nonfinal), Pkg::Config.project, nonfinal)
-      else
-        fail "Unexpected package format #{package_format}, cannot create symlinks."
-      end
-      remote_path = File.join(remote_base, File.basename(package))
-      link_path = Pkg::Paths.release_package_link_path(platform_tag, nonfinal)
-      link_command = <<-CMD
-        if [ ! -e #{remote_path} ]; then
-          echo "Uh oh! #{remote_path} doesn't exist! Can't create symlink."
-          exit 1
-        fi
-        if [ -e #{link_path} ] && [ ! -L #{link_path} ]; then
-          echo "Uh oh! #{link_path} exists but isn't a link, I don't know what to do with this."
-          exit 1
-        fi
-        if [ -L #{link_path} ] && [ ! #{remote_path} -ef #{link_path} ]; then
-          echo "Removing old link from $(readlink #{link_path}) to #{link_path} . . ."
-          rm #{link_path}
-        fi
-        ln -sf #{remote_path} #{link_path}
-      CMD
-      Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, link_command)
-    end
+    fail "Failed to create rolling repo link for '#{platform_tag}'.\n#{e}"
   end
 
   def test_ship(vm, ship_task)
     command = 'getent group release || groupadd release'
-    Pkg::Util::Net.remote_execute(vm, command)
+    Pkg::Util::Net.remote_ssh_cmd(vm, command)
     hosts_to_override = %w(
       APT_HOST
       DMG_HOST

data/lib/packaging/util/tool.rb

@@ -19,7 +19,7 @@ module Pkg::Util::Tool
           exts.each do |ext|
             locationext = File.expand_path(location + ext)
 
-            return '"' + locationext + '"' if FileTest.executable?(locationext)
+            return locationext if FileTest.executable?(locationext)
           end
         end
 

data/lib/packaging/util/version.rb

@@ -50,20 +50,12 @@ module Pkg::Util::Version
       end
     end
 
-    def extended_dash_version
-      Pkg::Util::Git.describe(['--tags', '--dirty', '--abbrev=7'])
-    end
-
     # This version is used for gems and platform types that do not support
     # dashes in the package version
     def dot_version(version = Pkg::Config.version)
       version.tr('-', '.')
     end
 
-    def extended_dot_version
-      dot_version(extended_dash_version)
-    end
-
     # Given a version, reformat it to be appropriate for a final package
     # version. This means we need to add a `0.` before the release version
     # for non-final builds

data/lib/packaging/util.rb

@@ -22,8 +22,8 @@ module Pkg::Util
   require 'packaging/util/git_tags'
 
   def self.boolean_value(var)
-    return true if var == true || ( var.is_a?(String) && ( var.downcase == 'true' || var.downcase =~ /^y$|^yes$/))
-    return false
+    return TRUE if var == TRUE || ( var.is_a?(String) && ( var.downcase == 'true' || var.downcase =~ /^y$|^yes$/))
+    FALSE
   end
 
   def self.in_project_root(&blk)

data/lib/packaging.rb

@@ -12,14 +12,14 @@ module Pkg
   require 'packaging/tar'
   require 'packaging/deb'
   require 'packaging/rpm'
+  require 'packaging/osx'
+  require 'packaging/ips'
   require 'packaging/nuget'
   require 'packaging/gem'
+  require 'packaging/msi'
   require 'packaging/repo'
   require 'packaging/artifactory'
   require 'packaging/retrieve'
-  require 'packaging/sign'
-  require 'packaging/archive'
-  require 'packaging/metrics'
 
   # Load configuration defaults
   Pkg::Config.load_defaults

data/spec/fixtures/config/params.yaml

@@ -0,0 +1,2 @@
+---
+:apt_host: foo

data/spec/lib/packaging/artifactory_spec.rb

@@ -14,37 +14,22 @@ describe 'artifactory.rb' do
       'el-6-x86_64' => {
         :artifact => "./el/6/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.el6.x86_64.rpm",
         :repo_config => "../repo_configs/rpm/pl-puppet-agent-f65f9efbb727c3d2d72d6799c0fc345a726f27b5-el-6-x86_64.repo",
-        :additional_artifacts => ["./el/6/PC1/x86_64/puppet-agent-extras-5.3.1.34.gf65f9ef-1.el6.x86_64.rpm"],
       },
       'ubuntu-16.04-amd64' => {
         :artifact => "./deb/xenial/PC1/puppet-agent_5.3.1.34.gf65f9ef-1xenial_amd64.deb",
         :repo_config => "../repo_configs/deb/pl-puppet-agent-f65f9efbb727c3d2d72d6799c0fc345a726f27b5-xenial.list",
-        :additional_artifacts => ["./deb/xenial/PC1/puppet-agent-extras_5.3.1.34.gf65f9ef-1xenial_amd64.deb"],
-      },
-      'debian-10-amd64' => {
-        :artifact => "./deb/buster/PC1/puppetdb_5.3.1.34.gf65f9ef-1buster_all.deb",
-        :repo_config => "../repo_configs/deb/pl-puppetdb-f65f9efbb727c3d2d72d6799c0fc345a726f27b5-buster.list",
-        :additional_artifacts => ["./deb/buster/PC1/puppetdb-termini_5.3.1.34.gf65f9ef-1buster_all.deb"],
       },
       'windows-2012-x86' => {
         :artifact => "./windows/puppet-agent-5.3.1.34-x86.msi",
         :repo_config => '',
-        :additional_artifacts => ["./windows/puppet-agent-extras-5.3.1.34-x86.msi"],
-      },
-      'windowsfips-2012-x64' => {
-        :artifact => "./windowsfips/puppet-agent-5.3.1.34-x64.msi",
-        :repo_config => '',
-        :additional_artifacts => ["./windowsfips/puppet-agent-extras-5.3.1.34-x64.msi"],
       },
-      'osx-10.15-x86_64' => {
-        :artifact => "./apple/10.15/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg",
+      'eos-4-i386' => {
+        :artifact => "./eos/4/PC1/i386/puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix",
         :repo_config => '',
-        :additional_artifacts => ["./apple/10.15/PC1/x86_64/puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.15.dmg"],
       },
-      'osx-11-x86_64' => {
-        :artifact => "./apple/11/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx11.dmg",
+      'osx-10.12-x86_64' => {
+        :artifact => "./apple/10.12/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.12.dmg",
         :repo_config => '',
-        :additional_artifacts => ["./apple/11/PC1/x86_64/puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx11.dmg"],
       },
       'solaris-10-sparc' => {
         :artifact => "./solaris/10/PC1/puppet-agent-5.3.1.34.gf65f9ef-1.sparc.pkg.gz",
@@ -59,7 +44,6 @@ describe 'artifactory.rb' do
       :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/el-6-x86_64",
       :package_format => 'rpm',
       :package_name => 'path/to/a/el/6/package/puppet-agent-5.3.1.34.gf65f9ef-1.el6.x86_64.rpm',
-      :all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.el6.x86_64.rpm', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.el6.x86_64.rpm']
     },
     'ubuntu-16.04-amd64' => {
       :toplevel_repo => 'debian__local',
@@ -67,45 +51,26 @@ describe 'artifactory.rb' do
       :codename => 'xenial',
       :arch => 'amd64',
       :package_name => 'path/to/a/xenial/package/puppet-agent_5.3.1.34.gf65f9ef-1xenial_amd64.deb',
-      :all_package_names => ['puppet-agent_5.3.1.34.gf65f9ef-1xenial_amd64.deb', 'puppet-agent-extras_5.3.1.34.gf65f9ef-1xenial_amd64.deb']
-    },
-    'debian-10-amd64' => {
-      :toplevel_repo => 'debian__local',
-      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/debian-10",
-      :codename => 'buster',
-      :arch => 'all',
-      :package_name => 'path/to/a/buster/package/puppetdb_5.3.1.34.gf65f9ef-1buster_all.deb',
-      :all_package_names => ['puppetdb_5.3.1.34.gf65f9ef-1buster_all.deb', 'puppetdb-termini_5.3.1.34.gf65f9ef-1buster_all.deb']
     },
     'windows-2012-x86' => {
       :toplevel_repo => 'generic',
       :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/windows-x86",
       :package_name => 'path/to/a/windows/package/puppet-agent-5.3.1.34-x86.msi',
-      :all_package_names => ['puppet-agent-5.3.1.34-x86.msi','puppet-agent-extras-5.3.1.34-x86.msi']
     },
-    'windowsfips-2012-x64' => {
+    'eos-4-i386' => {
       :toplevel_repo => 'generic',
-      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/windowsfips-x64",
-      :package_name => 'path/to/a/windowsfips/package/puppet-agent-5.3.1.34-x64.msi',
-      :all_package_names => ['puppet-agent-5.3.1.34-x64.msi','puppet-agent-extras-5.3.1.34-x64.msi']
+      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/eos-4-i386",
+      :package_name => 'path/to/an/eos/4/package/puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix',
     },
-    'osx-10.15-x86_64' => {
+    'osx-10.12-x86_64' => {
       :toplevel_repo => 'generic',
-      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-10.15-x86_64",
-      :package_name => 'path/to/an/osx/10.15/package/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg',
-      :all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx10.15.dmg']
-    },
-    'osx-11-x86_64' => {
-      :toplevel_repo => 'generic',
-      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-11-x86_64",
-      :package_name => 'path/to/an/osx/11/package/puppet-agent-5.3.1.34.gf65f9ef-1.osx11.dmg',
-      :all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.osx11.dmg', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.osx11.dmg']
+      :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/osx-10.12-x86_64",
+      :package_name => 'path/to/an/osx/10.12/package/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.12.dmg',
     },
     'solaris-10-sparc' => {
       :toplevel_repo => 'generic',
       :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/solaris-10-sparc",
       :package_name => 'path/to/a/solaris/10/package/puppet-agent-5.3.1.34.gf65f9ef-1.sparc.pkg.gz',
-      :all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.sparc.pkg.gz']
     },
   }
 
@@ -125,6 +90,7 @@ describe 'artifactory.rb' do
           expect(artifact.location_for(platform_tag)).to match_array([
             platform_tag_data[:toplevel_repo],
             platform_tag_data[:repo_subdirectories],
+            File.join('pool', platform_tag_data[:repo_subdirectories])
           ])
         end
       else
@@ -132,6 +98,7 @@ describe 'artifactory.rb' do
           expect(artifact.location_for(platform_tag)).to match_array([
             platform_tag_data[:toplevel_repo],
             platform_tag_data[:repo_subdirectories],
+            platform_tag_data[:repo_subdirectories]
           ])
         end
       end
@@ -140,6 +107,7 @@ describe 'artifactory.rb' do
         expect(artifact.location_for('generic')).to match_array([
           'generic',
           File.join(default_repo_name, project, project_version),
+          File.join(default_repo_name, project, project_version)
         ])
       end
     end
@@ -156,23 +124,6 @@ describe 'artifactory.rb' do
       end
     end
 
-    describe '#all_package_names' do
-      it 'parses the retrieved yaml file and returns the correct package name' do
-        all_package_names = artifact.all_package_names(platform_data, platform_tag)
-        all_package_names_data = [platform_tag_data[:additional_artifacts], platform_tag_data[:all_package_names]].flatten.compact
-        all_package_names.map! { |p| File.basename(p) }
-        all_package_names_data.map! { |p| File.basename(p) }
-        expect(all_package_names.size).to eq(all_package_names_data.size)
-        expect(all_package_names.sort).to eq(all_package_names_data.sort)
-      end
-
-      it 'fails if it cannot find a valid platform name' do
-        new_platform_data = platform_data
-        new_platform_data.delete_if { |k| k.match(platform_tag) }
-        expect{artifact.package_name(new_platform_data, platform_tag)}.to raise_error
-      end
-    end
-
     describe '#deb_list_contents' do
       it "returns the correct contents for the debian list file for #{platform_tag}" do
         if platform_tag_data[:codename]
@@ -196,13 +147,12 @@ describe 'artifactory.rb' do
     describe '#deploy_properties' do
       it "returns the correct contents for the deploy properties for #{platform_tag}" do
         if platform_tag_data[:codename]
-          expect(artifact.deploy_properties(platform_tag, File.basename(platform_tag_data[:package_name]))).to include({
+          expect(artifact.deploy_properties(platform_tag)).to include({
             'deb.distribution' => platform_tag_data[:codename],
-            'deb.component' => platform_tag_data[:repo_subdirectories],
-            'deb.architecture' => platform_tag_data[:arch]
+            'deb.component' => platform_tag_data[:repo_subdirectories]
           })
         else
-          expect(artifact.deploy_properties(platform_tag, File.basename(platform_tag_data[:package_name]))).not_to include({
+          expect(artifact.deploy_properties(platform_tag)).not_to include({
             'deb.component' => platform_tag_data[:repo_subdirectories]
           })
         end

data/spec/lib/packaging/config_spec.rb

@@ -4,9 +4,7 @@ require 'yaml'
 
 describe "Pkg::Config" do
 
-  Build_Params = [:apt_archive_path,
-                  :apt_archive_repo_command,
-                  :apt_host,
+  Build_Params = [:apt_host,
                   :apt_releases,
                   :apt_repo_path,
                   :apt_repo_url,
@@ -36,11 +34,9 @@ describe "Pkg::Config" do
                   :default_mock,
                   :description,
                   :dmg_path,
-                  :downloads_archive_path,
                   :email,
                   :files,
                   :final_mocks,
-                  :freight_archive_path,
                   :freight_conf,
                   :gem_default_executables,
                   :gem_dependencies,
@@ -84,7 +80,6 @@ describe "Pkg::Config" do
                   :nonfinal_apt_repo_path,
                   :nonfinal_apt_repo_staging_path,
                   :nonfinal_dmg_path,
-                  :nonfinal_gem_path,
                   :nonfinal_ips_path,
                   :nonfinal_msi_path,
                   :nonfinal_p5p_path,
@@ -132,7 +127,6 @@ describe "Pkg::Config" do
                   :version,
                   :version_file,
                   :version_strategy,
-                  :yum_archive_path,
                   :yum_host,
                   :yum_repo_path,
                   :yum_repo_name,
@@ -174,10 +168,10 @@ describe "Pkg::Config" do
       end
     end
 
-    mixed_params = { :sign_tar => true, :baz => 'qux' }
+    mixed_params = { :sign_tar => TRUE, :baz => 'qux' }
     context "given a hash with both valid and invalid params" do
       it "should set the valid param" do
-        Pkg::Config.should_receive(:instance_variable_set).with("@sign_tar", true)
+        Pkg::Config.should_receive(:instance_variable_set).with("@sign_tar", TRUE)
         Pkg::Config.config_from_hash(mixed_params)
       end
 
@@ -196,41 +190,43 @@ describe "Pkg::Config" do
   describe "#params" do
     it "should return a hash containing keys for all build parameters" do
       params = Pkg::Config.config
-      Build_Params.each { |param| params.has_key?(param).should == true }
+      Build_Params.each { |param| params.has_key?(param).should == TRUE }
     end
   end
 
   describe "#platform_data" do
     platform_tags = [
-      'osx-10.15-x86_64',
-      'osx-11-x86_64',
+      'eos-4-i386',
+      'osx-10.12-x86_64',
+      'cisco-wrlinux-7-x86_64',
       'ubuntu-16.04-i386',
-      'el-6-x86_64',
+      'cumulus-2.2-amd64',
+      'el-6-s390x',
       'el-7-ppc64le',
       'sles-12-x86_64',
     ]
 
     artifacts = \
-      "./artifacts/apple/10.15/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx10.15.dmg\n" \
-      "./artifacts/apple/11/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx11.dmg\n" \
+      "./artifacts/eos/4/PC1/i386/puppet-agent-5.3.2-1.eos4.i386.swix\n" \
+      "./artifacts/apple/10.12/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx10.12.dmg\n" \
+      "./artifacts/cisco-wrlinux/7/PC1/x86_64/puppet-agent-5.3.2-1.cisco_wrlinux7.x86_64.rpm\n" \
       "./artifacts/deb/xenial/PC1/puppet-agent_5.3.2-1xenial_i386.deb\n" \
-      "./artifacts/el/6/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.el6.x86_64.rpm\n" \
+      "./artifacts/deb/cumulus/PC1/puppet-agent_5.3.2-1cumulus_amd64.deb\n" \
+      "./artifacts/el/6/PC1/s390x/puppet-agent-5.3.2.658.gc79ef9a-1.el6.s390x.rpm\n" \
       "./artifacts/el/7/PC1/ppc64le/puppet-agent-5.3.2-1.el7.ppc64le.rpm\n" \
       "./artifacts/sles/12/PC1/x86_64/puppet-agent-5.3.2-1.sles12.x86_64.rpm"
 
     aix_artifacts = \
-      "./artifacts/aix/7.1/PC1/ppc/puppet-agent-5.3.2-1.aix7.1.ppc.rpm"
+      "./artifacts/aix/6.1/PC1/ppc/puppet-agent-5.3.2-1.aix6.1.ppc.rpm"
 
     fedora_artifacts = \
-      "./artifacts/fedora/31/PC1/x86_64/puppet-agent-5.3.2-1.fc31.x86_64.rpm"
+      "./artifacts/fedora/f25/PC1/x86_64/puppet-agent-5.3.2-1.fedoraf25.x86_64.rpm"
 
     windows_artifacts = \
       "./artifacts/windows/puppet-agent-x64.msi\n" \
       "./artifacts/windows/puppet-agent-5.3.2-x86.wixpdb\n" \
       "./artifacts/windows/puppet-agent-5.3.2-x86.msi\n" \
-      "./artifacts/windows/puppet-agent-5.3.2-x64.msi\n"\
-      "./artifacts/windowsfips/puppet-agent-x64.msi\n" \
-      "./artifacts/windowsfips/puppet-agent-5.3.2-x64.msi"
+      "./artifacts/windows/puppet-agent-5.3.2-x64.msi"
 
     solaris_artifacts = \
       "./artifacts/solaris/11/PC1/puppet-agent@5.3.2,5.11-1.sparc.p5p\n" \
@@ -242,11 +238,6 @@ describe "Pkg::Config" do
       "./artifacts/deb/stretch/PC1/puppet-agent_5.3.2.658.gc79ef9a-1stretch_amd64.deb\n" \
       "./artifacts/deb/stretch/PC1/puppet-agent-dbgsym_5.3.2.658.gc79ef9a-1stretch_amd64.deb"
 
-    artifacts_not_matching_project = \
-      "./artifacts/deb/xenial/pe-postgresql-contrib_2019.1.9.6.12-1xenial_amd64.deb\n" \
-      "./artifacts/deb/xenial/pe-postgresql-devel_2019.1.9.6.12-1xenial_amd64.deb\n" \
-      "./artifacts/deb/xenial/pe-postgresql-server_2019.1.9.6.12-1xenial_amd64.deb\n" \
-      "./artifacts/deb/xenial/pe-postgresql_2019.1.9.6.12-1xenial_amd64.deb"
     project = 'puppet-agent'
     ref = '5.3.2'
 
@@ -257,7 +248,7 @@ describe "Pkg::Config" do
     end
 
     it "should return a hash mapping platform tags to paths" do
-      allow(Pkg::Util::Net).to receive(:remote_execute).and_return(artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(artifacts, nil)
       expect(Pkg::Config.platform_data.keys).to eql(platform_tags)
     end
 
@@ -277,53 +268,42 @@ describe "Pkg::Config" do
     end
 
     it "should not use 'f' in fedora platform tags" do
-      allow(Pkg::Util::Net).to receive(:remote_execute).and_return(fedora_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(fedora_artifacts, nil)
       data = Pkg::Config.platform_data
-      expect(data).to include('fedora-31-x86_64')
-      expect(data).not_to include('fedora-f31-x86_64')
+      expect(data).to include('fedora-25-x86_64')
+      expect(data).not_to include('fedora-f25-x86_64')
     end
 
     it "should collect packages whose extname differ from package_format" do
-      allow(Pkg::Util::Net).to receive(:remote_execute).and_return(solaris_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(solaris_artifacts, nil)
       data = Pkg::Config.platform_data
       expect(data).to include('solaris-10-i386' => {:artifact => './solaris/10/PC1/puppet-agent-5.3.2-1.i386.pkg.gz', :repo_config => nil})
       expect(data).to include('solaris-11-sparc' => {:artifact => './solaris/11/PC1/puppet-agent@5.3.2,5.11-1.sparc.p5p', :repo_config => nil})
     end
 
     it "should collect versioned msis" do
-      allow(Pkg::Util::Net).to receive(:remote_execute).and_return(windows_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(windows_artifacts, nil)
       data = Pkg::Config.platform_data
       expect(data['windows-2012-x86']).to include(:artifact => './windows/puppet-agent-5.3.2-x86.msi')
       expect(data['windows-2012-x64']).to include(:artifact => './windows/puppet-agent-5.3.2-x64.msi')
-      expect(data['windowsfips-2012-x64']).to include(:artifact => './windowsfips/puppet-agent-5.3.2-x64.msi')
     end
 
     it "should not collect debug packages" do
-      allow(Pkg::Util::Net).to receive(:remote_execute).and_return(stretch_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(stretch_artifacts, nil)
       data = Pkg::Config.platform_data
       expect(data['debian-9-amd64']).to include(:artifact => './deb/stretch/PC1/puppet-agent_5.3.2.658.gc79ef9a-1stretch_amd64.deb')
     end
 
-    it "should collect packages that don't match the project name" do
-      allow(Pkg::Util::Net).to receive(:remote_execute).and_return(artifacts_not_matching_project, nil)
-      data = Pkg::Config.platform_data
-      expect(data['ubuntu-16.04-amd64']).to include(:artifact => './deb/xenial/pe-postgresql-contrib_2019.1.9.6.12-1xenial_amd64.deb')
-      expect(data['ubuntu-16.04-amd64'][:additional_artifacts].size).to eq(3)
-      expect(data['ubuntu-16.04-amd64'][:additional_artifacts]).to include('./deb/xenial/pe-postgresql-devel_2019.1.9.6.12-1xenial_amd64.deb')
-      expect(data['ubuntu-16.04-amd64'][:additional_artifacts]).to include('./deb/xenial/pe-postgresql-server_2019.1.9.6.12-1xenial_amd64.deb')
-      expect(data['ubuntu-16.04-amd64'][:additional_artifacts]).to include('./deb/xenial/pe-postgresql_2019.1.9.6.12-1xenial_amd64.deb')
-    end
-
     it "should use 'ppc' instead of 'power' in aix paths" do
-      allow(Pkg::Util::Net).to receive(:remote_execute).and_return(aix_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(aix_artifacts, nil)
       data = Pkg::Config.platform_data
-      expect(data['aix-7.1-power']).to include(:artifact => './aix/7.1/PC1/ppc/puppet-agent-5.3.2-1.aix7.1.ppc.rpm')
+      expect(data['aix-6.1-power']).to include(:artifact => './aix/6.1/PC1/ppc/puppet-agent-5.3.2-1.aix6.1.ppc.rpm')
     end
 
     it "should not record an aix repo config" do
-      allow(Pkg::Util::Net).to receive(:remote_execute).and_return(aix_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(aix_artifacts, nil)
       data = Pkg::Config.platform_data
-      expect(data['aix-7.1-power'][:repo_config]).to be_nil
+      expect(data['aix-6.1-power'][:repo_config]).to be_nil
     end
   end
 
@@ -356,7 +336,7 @@ describe "Pkg::Config" do
         # apt_host: is set to "foo" in the fixture
         orig = Pkg::Config.apt_host
         Pkg::Config.apt_host = "bar"
-        Pkg::Config.config_from_yaml(File.join(FIXTURES, 'config', 'ext', 'build_defaults.yaml'))
+        Pkg::Config.config_from_yaml(File.join(FIXTURES, 'config', 'params.yaml'))
         expect(Pkg::Config.apt_host).to eq("foo")
         Pkg::Config.apt_host = orig
       end