packaging 0.99.72 → 0.99.77

data/lib/packaging/sign/ips.rb

@@ -15,14 +15,14 @@ module Pkg::Sign::Ips
       repo_dir     = "#{work_dir}/repo"
       signed_dir   = "#{work_dir}/pkgs"
 
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "mkdir -p #{repo_dir} #{unsigned_dir} #{signed_dir}")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "mkdir -p #{repo_dir} #{unsigned_dir} #{signed_dir}")
       Pkg::Util::Net.rsync_to(p5p, rsync_host_string, unsigned_dir)
 
       # Before we can get started with signing packages we need to create a repo
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "sudo -E /usr/bin/pkgrepo create #{repo_dir}")
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "sudo -E /usr/bin/pkgrepo set -s #{repo_dir} publisher/prefix=puppetlabs.com")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "sudo -E /usr/bin/pkgrepo create #{repo_dir}")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "sudo -E /usr/bin/pkgrepo set -s #{repo_dir} publisher/prefix=puppetlabs.com")
       # And import all the packages into the repo.
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "sudo -E /usr/bin/pkgrecv -s #{unsigned_dir}/#{File.basename(p5p)} -d #{repo_dir} '*'")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "sudo -E /usr/bin/pkgrecv -s #{unsigned_dir}/#{File.basename(p5p)} -d #{repo_dir} '*'")
       # We are going to hard code the values for signing cert locations for now.
       # This autmation will require an update to actually become reusable, but
       # for now these values will stay this way so solaris signing will stop
@@ -37,21 +37,21 @@ module Pkg::Sign::Ips
                   -k /root/signing/signing_key_2020.pem \
                   -s 'file://#{work_dir}/repo' '*'"
       puts "About to sign #{p5p} with #{sign_cmd} in #{work_dir}"
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, sign_cmd.squeeze(' '))
+      Pkg::Util::Net.remote_execute(ssh_host_string, sign_cmd.squeeze(' '))
       # pkgrecv with -a will pull packages out of the repo, so we need to do that too to actually get the packages we signed
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "sudo -E /usr/bin/pkgrecv -d #{signed_dir}/#{File.basename(p5p)} -a -s #{repo_dir} '*'")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "sudo -E /usr/bin/pkgrecv -d #{signed_dir}/#{File.basename(p5p)} -a -s #{repo_dir} '*'")
       begin
         # lets make sure we actually signed something?
         # **NOTE** if we're repeatedly trying to sign the same version this
         # might explode because I don't know how to reset the IPS cache.
         # Everything is amazing.
-        Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "sudo -E /usr/bin/pkg contents -m -g #{signed_dir}/#{File.basename(p5p)} '*' | grep '^signature '")
+        Pkg::Util::Net.remote_execute(ssh_host_string, "sudo -E /usr/bin/pkg contents -m -g #{signed_dir}/#{File.basename(p5p)} '*' | grep '^signature '")
       rescue RuntimeError
         raise "Looks like #{File.basename(p5p)} was not signed correctly, quitting!"
       end
       # and pull the packages back.
       Pkg::Util::Net.rsync_from("#{signed_dir}/#{File.basename(p5p)}", rsync_host_string, File.dirname(p5p))
-      Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "if [ -e '#{work_dir}' ] ; then sudo rm -r '#{work_dir}' ; fi")
+      Pkg::Util::Net.remote_execute(ssh_host_string, "if [ -e '#{work_dir}' ] ; then sudo rm -r '#{work_dir}' ; fi")
     end
   end
 end

data/lib/packaging/sign/msi.rb

@@ -8,7 +8,7 @@ module Pkg::Sign::Msi
     rsync_host_string = "-e 'ssh #{use_identity}' Administrator@#{Pkg::Config.msi_signing_server}"
 
     work_dir = "Windows/Temp/#{Pkg::Util.rand_string}"
-    Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "mkdir -p C:/#{work_dir}")
+    Pkg::Util::Net.remote_execute(ssh_host_string, "mkdir -p C:/#{work_dir}")
     msis = Dir.glob("#{target_dir}/windows*/**/*.msi")
     Pkg::Util::Net.rsync_to(msis.join(" "), rsync_host_string, "/cygdrive/c/#{work_dir}",
                            extra_flags: ["--ignore-existing --relative"])
@@ -71,9 +71,8 @@ for msipath in #{msis.join(" ")}; do
     echo "$msi is already signed, skipping . . ." ;
   else
     tries=5
-    sha1Servers=(http://timestamp.verisign.com/scripts/timstamp.dll
-    http://timestamp.globalsign.com/scripts/timstamp.dll
-    http://www.startssl.com/timestamp)
+    sha1Servers=(http://timestamp.digicert.com/sha1/timestamp
+    http://timestamp.comodoca.com/authenticode)
     for timeserver in "${sha1Servers[@]}"; do
       for ((try=1; try<=$tries; try++)) do
         ret=$(/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe sign \
@@ -112,10 +111,14 @@ for msipath in #{msis.join(" ")}; do
 done
 CMD
 
-    Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, sign_command, false, '', false)
+    Pkg::Util::Net.remote_execute(
+      ssh_host_string,
+      sign_command,
+      { fail_fast: false }
+    )
     msis.each do | msi |
       Pkg::Util::Net.rsync_from("/cygdrive/c/#{work_dir}/#{msi}", rsync_host_string, File.dirname(msi))
     end
-    Pkg::Util::Net.remote_ssh_cmd(ssh_host_string, "if [ -d '/cygdrive/c/#{work_dir}' ]; then rm -rf '/cygdrive/c/#{work_dir}'; fi")
+    Pkg::Util::Net.remote_execute(ssh_host_string, "if [ -d '/cygdrive/c/#{work_dir}' ]; then rm -rf '/cygdrive/c/#{work_dir}'; fi")
   end
 end

data/lib/packaging/util/net.rb

@@ -20,13 +20,11 @@ module Pkg::Util::Net
     end
 
     # Check that the current host matches the one we think it should
-    def check_host(host, args = { :required => true })
-      if hostname == host
-        return true
-      else
-        fail "#{hostname} does not match #{host}" if args[:required]
-        return nil
-      end
+    def check_host(host, options = { required: true })
+      return true if hostname == host
+
+      fail "Error: #{hostname} does not match #{host}" if options[:required]
+      return nil
     end
 
     # @param hosts - An array of hosts to try ssh-ing into
@@ -38,7 +36,7 @@ module Pkg::Util::Net
       errs = []
       Array(hosts).flatten.each do |host|
         begin
-          remote_ssh_cmd(host, 'exit', false, '-oBatchMode=yes')
+          remote_execute(host, 'exit', { extra_options: '-oBatchMode=yes' })
         rescue
           errs << host
         end
@@ -56,7 +54,8 @@ module Pkg::Util::Net
       errs = []
       Array(hosts).flatten.each do |host|
         begin
-          remote_ssh_cmd(host, "gpg --list-secret-keys #{gpg} > /dev/null 2&>1", false, '-oBatchMode=yes')
+          remote_execute(host, "gpg --list-secret-keys #{gpg} > /dev/null 2&>1",
+                         { extra_options: '-oBatchMode=yes' })
         rescue
           errs << host
         end
@@ -64,40 +63,62 @@ module Pkg::Util::Net
       return errs
     end
 
-    def remote_ssh_cmd(target, command, capture_output = false, extra_options = '', fail_fast = true, trace = false)  # rubocop:disable Style/ParameterLists
+    def remote_execute(target_host, command, user_options = {})
+      option_defaults = {
+        capture_output: false,
+        extra_options: '',
+        fail_fast: true,
+        trace: false
+      }
+      options = option_defaults.merge(user_options)
 
       ssh = Pkg::Util::Tool.check_tool('ssh')
 
       # we pass some pretty complicated commands in via ssh. We need this to fail
       # if any part of the remote ssh command fails.
       shell_flags = ''
-      shell_flags += 'set -e;' if fail_fast
-      shell_flags += 'set -x;' if trace
+      shell_flags += 'set -e;' if options[:fail_fast]
+      shell_flags += 'set -x;' if options[:trace]
       shell_commands = "#{shell_flags}#{command}"
 
-      cmd = "#{ssh} #{extra_options} -t #{target} '#{shell_commands.gsub("'", "'\\\\''")}'"
+      remote_command = "#{ssh} #{options[:extra_options]} -t #{target_host} " +
+                       "'#{shell_commands.gsub("'", "'\\\\''")}'"
 
       # This is NOT a good way to support this functionality.
-      # It needs to be refactored into a set of methods that
-      # other methods can use to safely and deterministically
-      # support dry-run operations.
-      # But I need to ship packages RIGHT NOW.
-      # - Ryan McKern, 13/01/2016
       if ENV['DRYRUN']
         puts "[DRY-RUN] Executing '#{command}' on #{target}"
         puts "[DRY-RUN] #{cmd}"
-        return
+        return ''
       end
 
-      puts "Executing '#{command}' on #{target}"
-      if capture_output
-        stdout, stderr, exitstatus = Pkg::Util::Execution.capture3(cmd)
-        Pkg::Util::Execution.success?(exitstatus) or raise "Remote ssh command failed."
+      # We're forced to make different calls depending on the capture_output option
+      # because something about our #capture3 method screws up gpg. This should
+      # be untangled.
+      if options[:capture_output]
+        stdout, stderr, exitstatus = Pkg::Util::Execution.capture3(remote_command)
+        Pkg::Util::Execution.success?(exitstatus) or
+          raise "Remote ssh command (\"#{remote_command}\") failed."
         return stdout, stderr
-      else
-        Kernel.system(cmd)
-        Pkg::Util::Execution.success? or raise "Remote ssh command failed."
       end
+
+      # Pkg::Util::Execution.capture3 reports its command but Kernel.system does not
+      # Let's print it out for some amount of consistency.
+      puts "Remote Execute: '#{remote_command}'"
+      Kernel.system(remote_command)
+      Pkg::Util::Execution.success? or
+        raise "Remote ssh command (\"#{remote_command}\") failed."
+    end
+
+    ###
+    ### Deprecated method implemented as a shim to the new `remote_execute` method
+    ###
+    def remote_ssh_cmd(target, command, capture_output = false, extra_options = '', fail_fast = true, trace = false)  # rubocop:disable Style/ParameterLists
+      puts "Warn: \"remote_ssh_cmd\" call in packaging is deprecated. Use \"remote_execute\" instead."
+      remote_execute(target, command, {
+                       capture_output: capture_output,
+                       extra_options: extra_options,
+                       fail_fast: fail_fast,
+                       trace: trace })
     end
 
     # Construct a valid rsync command
@@ -272,17 +293,17 @@ module Pkg::Util::Net
 
     def remote_set_ownership(host, owner, group, files)
       remote_cmd = "for file in #{files.join(" ")}; do if [[ -d $file ]] || ! `lsattr $file | grep -q '\\-i\\-'`; then sudo chown #{owner}:#{group} $file; else echo \"$file is immutable\"; fi; done"
-      Pkg::Util::Net.remote_ssh_cmd(host, remote_cmd)
+      Pkg::Util::Net.remote_execute(host, remote_cmd)
     end
 
     def remote_set_permissions(host, permissions, files)
       remote_cmd = "for file in #{files.join(" ")}; do if [[ -d $file ]] || ! `lsattr $file | grep -q '\\-i\\-'`; then sudo chmod #{permissions} $file; else echo \"$file is immutable\"; fi; done"
-      Pkg::Util::Net.remote_ssh_cmd(host, remote_cmd)
+      Pkg::Util::Net.remote_execute(host, remote_cmd)
     end
 
     # Remotely set the immutable bit on a list of files
     def remote_set_immutable(host, files)
-      Pkg::Util::Net.remote_ssh_cmd(host, "sudo chattr +i #{files.join(" ")}")
+      Pkg::Util::Net.remote_execute(host, "sudo chattr +i #{files.join(" ")}")
     end
 
     # Create a symlink indicating the latest version of a package
@@ -328,7 +349,8 @@ module Pkg::Util::Net
         ln -sf "$link_target" #{full_package_name}-latest.#{platform_ext}
       CMD
 
-      _, err = Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, cmd, true)
+      _, err = Pkg::Util::Net.remote_execute(
+           Pkg::Config.staging_server, cmd, { capture_output: true })
       $stderr.puts err
     end
 
@@ -365,14 +387,14 @@ module Pkg::Util::Net
 #{tar} -zxvf /tmp/#{tarball_name}.tar.gz -C /tmp/ ;
 git clone --recursive /tmp/#{tarball_name} #{git_bundle_directory} ;
 DOC
-      Pkg::Util::Net.remote_ssh_cmd(host, command)
+      Pkg::Util::Net.remote_execute(host, command)
       return git_bundle_directory
     end
 
     def remote_bundle_install_command
       export_packaging_location = ''
       export_packaging_location = "export PACKAGING_LOCATION='#{ENV['PACKAGING_LOCATION']}';" if ENV['PACKAGING_LOCATION'] && !ENV['PACKAGING_LOCATION'].empty?
-      command = "source /usr/local/rvm/scripts/rvm; rvm use ruby-2.4.1; #{export_packaging_location} bundle install --path .bundle/gems ;"
+      command = "source /usr/local/rvm/scripts/rvm; rvm use ruby-2.5.1; #{export_packaging_location} bundle install --path .bundle/gems ;"
     end
 
     # Given a BuildInstance object and a host, send its params to the host. Return

data/lib/packaging/util/ship.rb

@@ -86,7 +86,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_ssh_cmd(staging_server, "mkdir -p #{remote_basepath}")
+          Pkg::Util::Net.remote_execute(staging_server, "mkdir -p #{remote_basepath}")
           Pkg::Util::Net.rsync_to(
             File.join(tmpdir, pkg),
             staging_server,
@@ -202,7 +202,7 @@ module Pkg::Util::Ship
   def create_rolling_repo_link(platform_tag, staging_server, repo_path, nonfinal = false)
     command = rolling_repo_link_command(platform_tag, repo_path, nonfinal)
 
-    Pkg::Util::Net.remote_ssh_cmd(staging_server, command) unless command.nil?
+    Pkg::Util::Net.remote_execute(staging_server, command) unless command.nil?
   rescue => e
     fail "Failed to create rolling repo link for '#{platform_tag}'.\n#{e}\n#{e.backtrace}"
   end
@@ -265,13 +265,13 @@ module Pkg::Util::Ship
         fi
         ln -sf #{remote_path} #{link_path}
       CMD
-      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, link_command)
+      Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, link_command)
     end
   end
 
   def test_ship(vm, ship_task)
     command = 'getent group release || groupadd release'
-    Pkg::Util::Net.remote_ssh_cmd(vm, command)
+    Pkg::Util::Net.remote_execute(vm, command)
     hosts_to_override = %w(
       APT_HOST
       DMG_HOST

data/spec/lib/packaging/artifactory_spec.rb

@@ -36,16 +36,16 @@ describe 'artifactory.rb' do
         :repo_config => '',
         :additional_artifacts => ["./windowsfips/puppet-agent-extras-5.3.1.34-x64.msi"],
       },
-      'eos-4-i386' => {
-        :artifact => "./eos/4/PC1/i386/puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix",
-        :repo_config => '',
-        :additional_artifacts => ["./eos/4/PC1/i386/puppet-agent-extras-5.3.1.34.gf65f9ef-1.eos4.i386.swix"],
-      },
       'osx-10.15-x86_64' => {
         :artifact => "./apple/10.15/PC1/x86_64/puppet-agent-5.3.1.34.gf65f9ef-1.osx10.15.dmg",
         :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",
+        :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",
         :repo_config => '',
@@ -89,18 +89,18 @@ describe 'artifactory.rb' do
       :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']
     },
-    'eos-4-i386' => {
-      :toplevel_repo => 'generic',
-      :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',
-      :all_package_names => ['puppet-agent-5.3.1.34.gf65f9ef-1.eos4.i386.swix', 'puppet-agent-extras-5.3.1.34.gf65f9ef-1.eos4.i386.swix']
-    },
     'osx-10.15-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']
+    },
     'solaris-10-sparc' => {
       :toplevel_repo => 'generic',
       :repo_subdirectories => "#{default_repo_name}/#{project}/#{project_version}/solaris-10-sparc",

data/spec/lib/packaging/config_spec.rb

@@ -202,9 +202,8 @@ describe "Pkg::Config" do
 
   describe "#platform_data" do
     platform_tags = [
-      'eos-4-i386',
       'osx-10.15-x86_64',
-      'cisco-wrlinux-7-x86_64',
+      'osx-11-x86_64',
       'ubuntu-16.04-i386',
       'el-6-x86_64',
       'el-7-ppc64le',
@@ -212,16 +211,15 @@ describe "Pkg::Config" do
     ]
 
     artifacts = \
-      "./artifacts/eos/4/PC1/i386/puppet-agent-5.3.2-1.eos4.i386.swix\n" \
       "./artifacts/apple/10.15/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx10.15.dmg\n" \
-      "./artifacts/cisco-wrlinux/7/PC1/x86_64/puppet-agent-5.3.2-1.cisco_wrlinux7.x86_64.rpm\n" \
+      "./artifacts/apple/11/PC1/x86_64/puppet-agent-5.3.2.658.gc79ef9a-1.osx11.dmg\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/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/6.1/PC1/ppc/puppet-agent-5.3.2-1.aix6.1.ppc.rpm"
+      "./artifacts/aix/7.1/PC1/ppc/puppet-agent-5.3.2-1.aix7.1.ppc.rpm"
 
     fedora_artifacts = \
       "./artifacts/fedora/31/PC1/x86_64/puppet-agent-5.3.2-1.fc31.x86_64.rpm"
@@ -259,7 +257,7 @@ describe "Pkg::Config" do
     end
 
     it "should return a hash mapping platform tags to paths" do
-      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_execute).and_return(artifacts, nil)
       expect(Pkg::Config.platform_data.keys).to eql(platform_tags)
     end
 
@@ -279,21 +277,21 @@ describe "Pkg::Config" do
     end
 
     it "should not use 'f' in fedora platform tags" do
-      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(fedora_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_execute).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')
     end
 
     it "should collect packages whose extname differ from package_format" do
-      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(solaris_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_execute).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_ssh_cmd).and_return(windows_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_execute).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')
@@ -301,13 +299,13 @@ describe "Pkg::Config" do
     end
 
     it "should not collect debug packages" do
-      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(stretch_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_execute).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_ssh_cmd).and_return(artifacts_not_matching_project, nil)
+      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)
@@ -317,15 +315,15 @@ describe "Pkg::Config" do
     end
 
     it "should use 'ppc' instead of 'power' in aix paths" do
-      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(aix_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_execute).and_return(aix_artifacts, nil)
       data = Pkg::Config.platform_data
-      expect(data['aix-6.1-power']).to include(:artifact => './aix/6.1/PC1/ppc/puppet-agent-5.3.2-1.aix6.1.ppc.rpm')
+      expect(data['aix-7.1-power']).to include(:artifact => './aix/7.1/PC1/ppc/puppet-agent-5.3.2-1.aix7.1.ppc.rpm')
     end
 
     it "should not record an aix repo config" do
-      allow(Pkg::Util::Net).to receive(:remote_ssh_cmd).and_return(aix_artifacts, nil)
+      allow(Pkg::Util::Net).to receive(:remote_execute).and_return(aix_artifacts, nil)
       data = Pkg::Config.platform_data
-      expect(data['aix-6.1-power'][:repo_config]).to be_nil
+      expect(data['aix-7.1-power'][:repo_config]).to be_nil
     end
   end
 

data/spec/lib/packaging/deb/repo_spec.rb

@@ -92,10 +92,10 @@ describe "Pkg::Deb::Repo" do
       Pkg::Repo.should_receive(:directories_that_contain_packages).and_return(pkg_directories)
       Pkg::Repo.should_receive(:populate_repo_directory)
       Pkg::Deb::Repo.should_receive(:repo_creation_command).and_return(command)
-      Pkg::Util::Net.should_receive(:remote_ssh_cmd).with(Pkg::Config.distribution_server, command)
+      Pkg::Util::Net.should_receive(:remote_execute).with(Pkg::Config.distribution_server, command)
       Pkg::Deb::Repo.should_receive(:generate_repo_configs)
       Pkg::Deb::Repo.should_receive(:ship_repo_configs)
-      Pkg::Util::Net.should_receive(:remote_ssh_cmd).with(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock" )
+      Pkg::Util::Net.should_receive(:remote_execute).with(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock" )
       Pkg::Deb::Repo.create_repos
     end
   end
@@ -115,7 +115,7 @@ describe "Pkg::Deb::Repo" do
       repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/repo_configs/deb"
       Pkg::Util::File.should_receive(:empty_dir?).with("pkg/repo_configs/deb").and_return(false)
       Pkg::Util::RakeUtils.should_receive(:invoke_task).with("pl:fetch")
-      Pkg::Util::Net.should_receive(:remote_ssh_cmd).with(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
+      Pkg::Util::Net.should_receive(:remote_execute).with(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
       Pkg::Util::Execution.should_receive(:retry_on_fail).with(:times => 3)
       Pkg::Deb::Repo.ship_repo_configs
     end

data/spec/lib/packaging/paths_spec.rb

@@ -3,10 +3,11 @@ require 'spec_helper'
 describe 'Pkg::Paths' do
   describe '#arch_from_artifact_path' do
     arch_transformations = {
-      ['artifacts/aix/6.1/puppet6/ppc/puppet-agent-6.9.0-1.aix6.1.ppc.rpm', 'aix', '6.1'] => 'power',
       ['pkg/el-8-x86_64/puppet-agent-6.9.0-1.el8.x86_64.rpm', 'el', '8'] => 'x86_64',
+      ['pkg/el/8/puppet6/aarch64/puppet-agent-6.5.0.3094.g16b6fa6f-1.el8.aarch64.rpm', 'el', '8'] => 'aarch64',
       ['artifacts/fedora/32/puppet6/x86_64/puppet-agent-6.9.0-1.fc30.x86_64.rpm', 'fedora', '32'] => 'x86_64',
       ['pkg/ubuntu-16.04-amd64/puppet-agent_4.99.0-1xenial_amd64.deb', 'ubuntu', '16.04'] => 'amd64',
+      ['artifacts/deb/focal/puppet6/puppet-agent_6.5.0.3094.g16b6fa6f-1focal_arm64.deb', 'ubuntu', '20.04'] => 'aarch64',
 
       ['artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz', 'ubuntu', '16.04'] => 'source',
       ['artifacts/deb/jessie/PC1/puppetserver_5.0.1.master.orig.tar.gz', 'debian', '8'] => 'source',
@@ -22,7 +23,6 @@ describe 'Pkg::Paths' do
 
   describe '#tag_from_artifact_path' do
     path_tranformations = {
-      'artifacts/aix/6.1/puppet6/ppc/puppet-agent-6.9.0-1.aix6.1.ppc.rpm' => 'aix-6.1-power',
       'pkg/el-7-x86_64/puppet-agent-5.5.22-1.el8.x86_64.rpm' => 'el-7-x86_64',
       'pkg/ubuntu-20.04-amd64/puppet-agent_5.5.22-1xenial_amd64.deb' => 'ubuntu-20.04-amd64',
       'pkg/windows/puppet-agent-5.5.22-x86.msi' => 'windows-2012-x86',
@@ -33,6 +33,7 @@ describe 'Pkg::Paths' do
       'pkg/pe/deb/bionic/pe-puppetserver_2019.8.2.32-1bionic_all.deb' => 'ubuntu-18.04-amd64',
       'artifacts/deb/focal/puppet6/puppetdb_6.13.0-1focal_all.deb' => 'ubuntu-20.04-amd64',
       'pkg/apple/10.15/puppet6/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg' => 'osx-10.15-x86_64',
+      'pkg/apple/11/puppet6/x86_64/puppet-agent-6.19.0-1.osx11.dmg' => 'osx-11-x86_64',
       'pkg/windows/puppet-agent-1.9.0-x86.msi' => 'windows-2012-x86',
       'pkg/pe/rpm/el-6-i386/pe-puppetserver-2017.3.0.3-1.el6.src.rpm' => 'el-6-SRPMS',
       'pkg/pe/deb/xenial/pe-puppetserver_2017.3.0.3-1puppet1.orig.tar.gz' => 'ubuntu-16.04-source',
@@ -64,8 +65,8 @@ describe 'Pkg::Paths' do
     end
 
     it 'should return repo_name for final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
-      expect(Pkg::Paths.repo_name).to eq('puppet7')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
+      expect(Pkg::Paths.repo_name).to eq('FUTURE-puppet7')
     end
 
     it 'should be empty string if repo_name is not set for final version' do
@@ -123,6 +124,11 @@ describe 'Pkg::Paths' do
           .to eq('artifacts/mac/puppet6/10.15/x86_64')
       end
 
+      it 'should be correct for osx11' do
+        expect(Pkg::Paths.artifacts_path('osx-11-x86_64'))
+          .to eq('artifacts/mac/puppet6/11/x86_64')
+      end
+
       it 'should be correct for windows' do
         expect(Pkg::Paths.artifacts_path('windows-2012-x64'))
           .to eq('artifacts/windows/puppet6')
@@ -131,16 +137,16 @@ describe 'Pkg::Paths' do
 
     context 'after puppet 7 apt changes' do
       before :each do
-        allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
+        allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
       end
 
       it 'should be correct for bionic' do
         expect(Pkg::Paths.artifacts_path('ubuntu-18.04-amd64'))
-          .to eq('artifacts/puppet7/bionic')
+          .to eq('artifacts/FUTURE-puppet7/bionic')
       end
       it 'should be correct for focal' do
         expect(Pkg::Paths.artifacts_path('ubuntu-20.04-amd64'))
-          .to eq('artifacts/puppet7/focal')
+          .to eq('artifacts/FUTURE-puppet7/focal')
       end
     end
   end
@@ -201,13 +207,13 @@ describe 'Pkg::Paths' do
     end
 
     it 'should return nonfinal_repo_name for nonfinal version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
-      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('puppet7-nightly')
-      expect(Pkg::Paths.apt_repo_name(true)).to eq('puppet7-nightly')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('FUTURE-puppet7-nightly')
+      expect(Pkg::Paths.apt_repo_name(true)).to eq('FUTURE-puppet7-nightly')
     end
 
     it 'should fail if nonfinal_repo_name is not set for non-final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
       allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nil)
       expect { Pkg::Paths.apt_repo_name(true) }.to raise_error
     end
@@ -222,8 +228,8 @@ describe 'Pkg::Paths' do
 
     it 'should return `Pkg::Config.yum_repo_name` if `Pkg::Config.repo_name` is not set' do
       allow(Pkg::Config).to receive(:repo_name).and_return(nil)
-      allow(Pkg::Config).to receive(:yum_repo_name).and_return('puppet7')
-      expect(Pkg::Paths.yum_repo_name).to eq('puppet7')
+      allow(Pkg::Config).to receive(:yum_repo_name).and_return('FUTURE-puppet7')
+      expect(Pkg::Paths.yum_repo_name).to eq('FUTURE-puppet7')
     end
 
     it 'should return \'products\' if nothing is set' do
@@ -233,13 +239,13 @@ describe 'Pkg::Paths' do
     end
 
     it 'should return nonfinal_repo_name for nonfinal version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
-      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('puppet7-nightly')
-      expect(Pkg::Paths.yum_repo_name(true)).to eq('puppet7-nightly')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('FUTURE-puppet7-nightly')
+      expect(Pkg::Paths.yum_repo_name(true)).to eq('FUTURE-puppet7-nightly')
     end
 
     it 'should fail if nonfinal_repo_name is not set for non-final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet7')
+      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
       allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nil)
       expect { Pkg::Paths.yum_repo_name(true) }.to raise_error
     end
@@ -319,15 +325,15 @@ describe 'Pkg::Paths' do
     context 'for puppet 7 and after' do
       it 'returns the approprate apt repo path' do
         allow(Pkg::Paths).to receive(:remote_repo_base).and_return('/opt/repository/apt')
-        expect(Pkg::Paths.apt_package_base_path('ubuntu-18.04-amd64', 'puppet7', 'puppet-agent'))
-          .to eq('/opt/repository/apt/puppet7/pool/bionic/p/puppet-agent')
-        expect(Pkg::Paths.apt_package_base_path('ubuntu-20.04-amd64', 'puppet7', 'puppet-agent'))
-          .to eq('/opt/repository/apt/puppet7/pool/focal/p/puppet-agent')
+        expect(Pkg::Paths.apt_package_base_path('ubuntu-18.04-amd64', 'FUTURE-puppet7', 'puppet-agent'))
+          .to eq('/opt/repository/apt/FUTURE-puppet7/pool/bionic/p/puppet-agent')
+        expect(Pkg::Paths.apt_package_base_path('ubuntu-20.04-amd64', 'FUTURE-puppet7', 'puppet-agent'))
+          .to eq('/opt/repository/apt/FUTURE-puppet7/pool/focal/p/puppet-agent')
       end
       it 'returns the appropriate nonfinal repo path' do
         allow(Pkg::Paths).to receive(:remote_repo_base).and_return('/opt/repository-nightlies/apt')
-        expect(Pkg::Paths.apt_package_base_path('debian-10-amd64', 'puppet7-nightly', 'pdk', true))
-          .to eq('/opt/repository-nightlies/apt/puppet7-nightly/pool/buster/p/pdk')
+        expect(Pkg::Paths.apt_package_base_path('debian-10-amd64', 'FUTURE-puppet7-nightly', 'pdk', true))
+          .to eq('/opt/repository-nightlies/apt/FUTURE-puppet7-nightly/pool/buster/p/pdk')
       end
     end
   end
@@ -366,13 +372,14 @@ describe 'Pkg::Paths' do
       end
       it 'returns nil for package formats that do not have release packages' do
         expect(Pkg::Paths.release_package_link_path('osx-10.15-x86_64')).to eq(nil)
+        expect(Pkg::Paths.release_package_link_path('osx-11-x86_64')).to eq(nil)
         expect(Pkg::Paths.release_package_link_path('windows-2012-x86')).to eq(nil)
       end
     end
 
     context 'for puppet 7' do
-      repo_name = 'puppet7'
-      nonfinal_repo_name = 'puppet7-nightly'
+      repo_name = 'FUTURE-puppet7'
+      nonfinal_repo_name = 'FUTURE-puppet7-nightly'
       yum_repo_path = '/opt/repository/yum'
       apt_repo_path = '/opt/repository/apt'
       nonfinal_yum_repo_path = '/opt/repository-nightlies/yum'
@@ -403,6 +410,7 @@ describe 'Pkg::Paths' do
       end
       it 'returns nil for package formats that do not have release packages' do
         expect(Pkg::Paths.release_package_link_path('osx-10.15-x86_64')).to eq(nil)
+        expect(Pkg::Paths.release_package_link_path('osx-11-x86_64')).to eq(nil)
         expect(Pkg::Paths.release_package_link_path('windows-2012-x86')).to eq(nil)
       end
     end