packaging 0.99.75 → 0.99.79

data/spec/lib/packaging/platforms_spec.rb

@@ -4,7 +4,7 @@ describe 'Pkg::Platforms' do
   describe '#by_package_format' do
     it 'should return an array of platforms that use a given format' do
       deb_platforms = ['debian', 'ubuntu']
-      rpm_platforms = ['aix', 'cisco-wrlinux', 'el', 'fedora', 'redhatfips', 'sles']
+      rpm_platforms = ['aix', 'el', 'fedora', 'redhatfips', 'sles']
       expect(Pkg::Platforms.by_package_format('deb')).to match_array(deb_platforms)
       expect(Pkg::Platforms.by_package_format('rpm')).to match_array(rpm_platforms)
     end
@@ -12,14 +12,14 @@ describe 'Pkg::Platforms' do
 
   describe '#formats' do
     it 'should return all package formats' do
-      fmts = ['rpm', 'deb', 'swix', 'dmg', 'svr4', 'ips', 'msi']
+      fmts = ['rpm', 'deb', 'dmg', 'svr4', 'ips', 'msi']
       expect(Pkg::Platforms.formats).to match_array(fmts)
     end
   end
 
   describe '#supported_platforms' do
     it 'should return all supported platforms' do
-      platforms = ['aix', 'cisco-wrlinux', 'debian', 'el', 'eos', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
+      platforms = ['aix', 'debian', 'el', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
       expect(Pkg::Platforms.supported_platforms).to match_array(platforms)
     end
   end
@@ -36,7 +36,7 @@ describe 'Pkg::Platforms' do
 
   describe '#codenames' do
     it 'should return all codenames for a given platform' do
-      codenames = ['focal', 'bionic', 'buster', 'cosmic', 'jessie', 'stretch', 'trusty', 'xenial']
+      codenames = ['focal', 'bionic', 'bullseye', 'buster', 'cosmic', 'jessie', 'stretch', 'trusty', 'xenial']
       expect(Pkg::Platforms.codenames).to match_array(codenames)
     end
   end
@@ -97,14 +97,16 @@ describe 'Pkg::Platforms' do
   end
 
   describe '#platform_lookup' do
-    it 'should return a hash of platform info' do
-      expect(Pkg::Platforms.platform_lookup('osx-10.15-x86_64')).to be_instance_of(Hash)
-    end
-
-    it 'should include at least arch and package format keys' do
-      expect(Pkg::Platforms.platform_lookup('osx-10.15-x86_64').keys).to include(:architectures)
-      expect(Pkg::Platforms.platform_lookup('osx-10.15-x86_64').keys).to include(:package_format)
-    end
+    ['osx-10.15-x86_64', 'osx-11-x86_64'].each do |platform|
+      it 'should return a hash of platform info' do
+        expect(Pkg::Platforms.platform_lookup(platform)).to be_instance_of(Hash)
+      end
+  
+      it 'should include at least arch and package format keys' do
+        expect(Pkg::Platforms.platform_lookup(platform).keys).to include(:architectures)
+        expect(Pkg::Platforms.platform_lookup(platform).keys).to include(:package_format)
+      end
+    end 
   end
 
   describe '#get_attribute' do
@@ -113,7 +115,7 @@ describe 'Pkg::Platforms' do
     end
 
     it 'fails with a reasonable error when specified attribute is not defined' do
-      expect { Pkg::Platforms.get_attribute('eos-4-i386', :signature_format) }.to raise_error(/doesn't have information/)
+      expect { Pkg::Platforms.get_attribute('osx-10.15-x86_64', :signature_format) }.to raise_error(/doesn't have information/)
     end
   end
 
@@ -129,8 +131,6 @@ describe 'Pkg::Platforms' do
       'windows-2012-x86' => ['windows', '2012', 'x86'],
       'windowsfips-2012-x64' => ['windowsfips', '2012', 'x64'],
       'el-7-x86_64' => ['el', '7', 'x86_64'],
-      'cisco-wrlinux-7-x86_64' => ['cisco-wrlinux', '7', 'x86_64'],
-      'cisco-wrlinux-7' => ['cisco-wrlinux', '7', ''],
       'el-6' => ['el', '6', ''],
       'xenial-amd64' => ['ubuntu', '16.04', 'amd64'],
       'xenial' => ['ubuntu', '16.04', ''],

data/spec/lib/packaging/repo_spec.rb

@@ -128,7 +128,7 @@ describe "#Pkg::Repo" do
     end
 
     it 'should execute command if optional params are nil' do
-      expect(Pkg::Util::Net).to receive(:remote_ssh_cmd).with(remote_host, "some command with #{repo_name} and #{repo_path} and stuff")
+      expect(Pkg::Util::Net).to receive(:remote_execute).with(remote_host, "some command with #{repo_name} and #{repo_path} and stuff")
       Pkg::Repo.update_repo(remote_host, repo_command, { :repo_name => repo_name, :repo_path => repo_path })
     end
   end

data/spec/lib/packaging/retrieve_spec.rb

@@ -7,11 +7,12 @@ describe 'Pkg::Retrieve' do
   remote_target = 'repos'
   project = 'puppet-agent'
   ref = 'b25e64984dd505391f248fe5501ad81e2645b6d2'
-  foss_platforms = ['el-7-x86_64', 'ubuntu-16.04-amd64', 'osx-10.11-x86_64', 'windows-2012-x64']
+  foss_platforms = ['el-7-x86_64', 'ubuntu-16.04-amd64', 'osx-10.15-x86_64', 'osx-11-x86_64', 'windows-2012-x64']
   platform_data = {:platform_data => {
-    'aix-6.1-power' => {:artifact => './aix/6.1/PC1/ppc/puppet-agent-5.3.2.155.gb25e649-1.aix6.1.ppc.rpm'},
+    'aix-7.1-power' => {:artifact => './aix/7.1/PC1/ppc/puppet-agent-5.3.2.155.gb25e649-1.aix7.1.ppc.rpm'},
     'el-7-x86_64' => {:artifact => './el/7/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.el7.x86_64.rpm'},
-    'osx-10.11-x86_64' => {:artifact => './apple/10.11/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.osx10.11.dmg'},
+    'osx-10.15-x86_64' => {:artifact => './apple/10.15/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.osx10.15.dmg'},
+    'osx-11-x86_64' => {:artifact => './apple/11/PC1/x86_64/puppet-agent-5.3.2.155.gb25e649-1.osx11.dmg'},
     'sles-11-i386' => {:artifact => './sles/11/PC1/i386/puppet-agent-5.3.2.155.gb25e649-1.sles11.i386.rpm'},
     'solaris-10-sparc' => {:artifact => './solaris/10/PC1/puppet-agent-5.3.2.155.gb25e649-1.sparc.pkg.gz'},
     'ubuntu-16.04-amd64' => {:artifact => './deb/xenial/PC1/puppet-agent_5.3.2.155.gb25e649-1xenial_amd64.deb'},

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

@@ -102,10 +102,10 @@ describe "Pkg::Rpm::Repo" do
       Pkg::Repo.should_receive(:directories_that_contain_packages).and_return(pkg_directories)
       Pkg::Repo.should_receive(:populate_repo_directory)
       Pkg::Rpm::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::Rpm::Repo.should_receive(:generate_repo_configs)
       Pkg::Rpm::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::Rpm::Repo.create_remote_repos
     end
   end
@@ -125,7 +125,7 @@ describe "Pkg::Rpm::Repo" do
       repo_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/repo_configs/rpm"
       Pkg::Util::File.should_receive(:empty_dir?).with("pkg/repo_configs/rpm").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::Rpm::Repo.ship_repo_configs
     end

data/spec/lib/packaging/sign_spec.rb

@@ -65,7 +65,6 @@ DOC
     describe '#sign_all' do
       let(:rpm_directory) { 'foo' }
       let(:rpms_not_to_sign) { [
-        "#{rpm_directory}/aix/6.1/PC1/ppc/puppet-agent-5.5.3-1.aix6.1.ppc.rpm",
         "#{rpm_directory}/aix/7.1/PC1/ppc/puppet-agent-5.5.3-1.aix7.1.ppc.rpm",
       ] }
       let(:v3_rpms) { [
@@ -77,7 +76,6 @@ DOC
       ] }
       let(:rpms) { rpms_not_to_sign + v3_rpms + v4_rpms }
       let(:already_signed_rpms) { [
-        "#{rpm_directory}/cisco-wrlinux/7/PC1/x86_64/puppet-agent-5.5.3-1.cisco_wrlinux7.x86_64.rpm",
         "#{rpm_directory}/el/6/PC1/x86_64/puppet-agent-5.5.3-1.el6.x86_64.rpm",
       ] }
       let(:noarch_rpms) { [

data/spec/lib/packaging/util/git_tag_spec.rb

@@ -17,7 +17,7 @@ describe "Pkg::Util::Git_tag" do
 
   context "branch?" do
     it "sets ref type as a branch when passed a branch" do
-      git_tag = Pkg::Util::Git_tag.new("git://github.com/puppetlabs/leatherman.git", "master")
+      git_tag = Pkg::Util::Git_tag.new("git://github.com/puppetlabs/leatherman.git", "main")
       expect(git_tag.branch?).to eq(true)
     end
   end

data/spec/lib/packaging/util/net_spec.rb

@@ -54,24 +54,35 @@ describe "Pkg::Util::Net" do
   end
 
   describe "remote_ssh_cmd" do
+    it "should be able to call via deprecated shim" do
+      Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
+      Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e;bar'")
+      Pkg::Util::Execution.should_receive(:success?).and_return(true)
+      Pkg::Util::Net.remote_ssh_cmd("foo", "bar", true)
+    end
+  end
+
+  describe "remote_execute" do
     it "should fail if ssh is not present" do
       Pkg::Util::Tool.stub(:find_tool).with("ssh") { fail }
       Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_raise(RuntimeError)
-      expect{ Pkg::Util::Net.remote_ssh_cmd("foo", "bar") }.to raise_error(RuntimeError)
+      expect{ Pkg::Util::Net.remote_execute("foo", "bar") }.to raise_error(RuntimeError)
     end
 
     it "should be able to not fail fast" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
         Kernel.should_receive(:system).with("#{ssh}  -t foo 'bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_ssh_cmd("foo", "bar", false, '', false)
+        Pkg::Util::Net.remote_execute(
+          "foo", "bar", capture_output: false, extra_options: '', fail_fast: false)
     end
 
     it "should be able to trace output" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
         Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -x;bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_ssh_cmd("foo", "bar", false, '', false, true)
+        Pkg::Util::Net.remote_execute(
+          "foo", "bar", capture_output: false, fail_fast: false, trace: true)
     end
 
     context "without output captured" do
@@ -79,21 +90,22 @@ describe "Pkg::Util::Net" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
         Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e;bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_ssh_cmd("foo", "bar")
+        Pkg::Util::Net.remote_execute("foo", "bar")
       end
 
       it "should escape single quotes in the command" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
         Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e;b'\\''ar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_ssh_cmd("foo", "b'ar")
+        Pkg::Util::Net.remote_execute("foo", "b'ar")
       end
 
       it "should raise an error if ssh fails" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
         Kernel.should_receive(:system).with("#{ssh}  -t foo 'set -e;bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(false)
-        expect{ Pkg::Util::Net.remote_ssh_cmd("foo", "bar") }.to raise_error(RuntimeError, /Remote ssh command failed./)
+        expect{ Pkg::Util::Net.remote_execute("foo", "bar") }
+          .to raise_error(RuntimeError, /failed./)
       end
     end
 
@@ -102,21 +114,22 @@ describe "Pkg::Util::Net" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
         Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e;bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_ssh_cmd("foo", "bar", true)
+        Pkg::Util::Net.remote_execute("foo", "bar", capture_output: true)
       end
 
       it "should escape single quotes in the command" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
         Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e;b'\\''ar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(true)
-        Pkg::Util::Net.remote_ssh_cmd("foo", "b'ar", true)
+        Pkg::Util::Net.remote_execute("foo", "b'ar", capture_output: true)
       end
 
       it "should raise an error if ssh fails" do
         Pkg::Util::Tool.should_receive(:check_tool).with("ssh").and_return(ssh)
         Pkg::Util::Execution.should_receive(:capture3).with("#{ssh}  -t foo 'set -e;bar'")
         Pkg::Util::Execution.should_receive(:success?).and_return(false)
-        expect{ Pkg::Util::Net.remote_ssh_cmd("foo", "bar", true) }.to raise_error(RuntimeError, /Remote ssh command failed./)
+        expect{ Pkg::Util::Net.remote_execute("foo", "bar", capture_output: true) }
+          .to raise_error(RuntimeError, /failed./)
       end
     end
   end

data/spec/lib/packaging/util/ship_spec.rb

@@ -126,7 +126,7 @@ describe '#Pkg::Util::Ship' do
       # All of these expects must be called in the same block in order for the
       # tests to work without actually shipping anything
       expect(Pkg::Util::Net)
-        .to receive(:remote_ssh_cmd)
+        .to receive(:remote_execute)
               .with(test_staging_server, /#{test_remote_path}/)
               .exactly(retrieved_packages.count).times
       expect(Pkg::Util::Net)
@@ -167,7 +167,7 @@ describe '#Pkg::Util::Ship' do
       # All of these expects must be called in the same block in order for the
       # tests to work without actually shipping anything
       expect(Pkg::Util::Net)
-        .to receive(:remote_ssh_cmd)
+        .to receive(:remote_execute)
               .with(test_staging_server, /#{test_remote_path}/)
       expect(Pkg::Util::Net)
         .to receive(:rsync_to)

data/tasks/archive.rake

@@ -39,7 +39,7 @@ namespace :pl do
     task :deploy_staged_apt_archives_to_s3 => 'pl:fetch' do
       command = 'sudo /usr/local/bin/s3_repo_sync.sh release-archives.puppet.com/apt'
       Pkg::Util::Execution.retry_on_fail(:times => 3) do
-        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
+        Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
       end
     end
 
@@ -47,7 +47,7 @@ namespace :pl do
     task :deploy_staged_yum_archives_to_s3 => 'pl:fetch' do
       command = 'sudo /usr/local/bin/s3_repo_sync.sh release-archives.puppet.com/yum'
       Pkg::Util::Execution.retry_on_fail(:times => 3) do
-        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
+        Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
       end
     end
 
@@ -55,7 +55,7 @@ namespace :pl do
     task :deploy_staged_downloads_archives_to_s3 => 'pl:fetch' do
       command = 'sudo /usr/local/bin/s3_repo_sync.sh release-archives.puppet.com/downloads'
       Pkg::Util::Execution.retry_on_fail(:times => 3) do
-        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.staging_server, command)
+        Pkg::Util::Net.remote_execute(Pkg::Config.staging_server, command)
       end
     end
 
@@ -67,4 +67,3 @@ namespace :pl do
     end
   end
 end
-

data/tasks/config.rake

@@ -6,6 +6,11 @@ namespace :config do
     end
   end
 
+  desc "validate Pkg::Config values for this repo"
+  task :validate do
+    Pkg::Config.perform_validations
+  end
+
   task :print_hosts => 'pl:fetch' do
     Pkg::Util.filter_configs('host').each do |key, value|
       puts "#{key}: #{value}"

data/tasks/education.rake

@@ -35,7 +35,7 @@ namespace :pl do
       end
 
       # If the archive directory exists, move old VMs to it
-      Pkg::Util::Net.remote_ssh_cmd(target_host, "if [ -d #{target_directory}/archive ]; then #{archive_cmd}; fi")
+      Pkg::Util::Net.remote_execute(target_host, "if [ -d #{target_directory}/archive ]; then #{archive_cmd}; fi")
 
       # Ship VM and md5 to host
       Pkg::Util::Net.rsync_to(vm, target_host, target_directory)
@@ -45,10 +45,10 @@ namespace :pl do
       link_target.each do |link|
         link_path = File.join(target_directory, link)
         link_md5_path = "#{link_path}.md5"
-        Pkg::Util::Net.remote_ssh_cmd(target_host, "if [[ -L '#{link_path}' ]] && [[ ! -e '#{link_path}' ]] ; then echo '#{link_path} is a broken link, deleting' ; unlink '#{link_path}' ; fi")
-        Pkg::Util::Net.remote_ssh_cmd(target_host, "if [[ -L '#{link_md5_path}' ]] && [[ ! -e '#{link_md5_path}' ]] ; then echo '#{link_md5_path} is a broken link, deleting' ; unlink '#{link_md5_path}' ; fi")
-        Pkg::Util::Net.remote_ssh_cmd(target_host, "cd #{target_directory} ; ln -sf #{File.basename(vm)} #{link}")
-        Pkg::Util::Net.remote_ssh_cmd(target_host, "cd #{target_directory} ; ln -sf #{File.basename(md5)} #{link}.md5")
+        Pkg::Util::Net.remote_execute(target_host, "if [[ -L '#{link_path}' ]] && [[ ! -e '#{link_path}' ]] ; then echo '#{link_path} is a broken link, deleting' ; unlink '#{link_path}' ; fi")
+        Pkg::Util::Net.remote_execute(target_host, "if [[ -L '#{link_md5_path}' ]] && [[ ! -e '#{link_md5_path}' ]] ; then echo '#{link_md5_path} is a broken link, deleting' ; unlink '#{link_md5_path}' ; fi")
+        Pkg::Util::Net.remote_execute(target_host, "cd #{target_directory} ; ln -sf #{File.basename(vm)} #{link}")
+        Pkg::Util::Net.remote_execute(target_host, "cd #{target_directory} ; ln -sf #{File.basename(md5)} #{link}.md5")
       end
 
       puts "'#{vm}' and '#{md5}' have been shipped via rsync to '#{target_host}/#{target_directory}'"

data/tasks/fetch.rake

@@ -30,28 +30,31 @@ namespace :pl do
   task :fetch do
     # Remove .packaging directory from old-style extras loading
     rm_rf "#{ENV['HOME']}/.packaging" if File.directory?("#{ENV['HOME']}/.packaging")
+
     # Touch the .packaging file which is allows packaging to present remote tasks
     touch "#{ENV['HOME']}/.packaging"
 
     begin
-      temp_build_data_dir = Pkg::Util::File.mktemp
-      %x(git clone #{data_repo} #{temp_build_data_dir})
-      if $?.success?
-        Dir.chdir(temp_build_data_dir) do
-          [team_data_branch, project_data_branch].each do |branch|
-            %x(git checkout #{branch})
-            if $?.success?
-              Pkg::Util::RakeUtils.invoke_task("pl:load_extras", temp_build_data_dir)
-            else
-              warn "Unable to load build_defaults from branch '#{branch}' in '#{data_repo}'. Skipping."
-            end
+      build_data_directory = Pkg::Util::File.mktemp
+      %x(git clone #{data_repo} #{build_data_directory})
+      unless $?.success?
+        fail 'Error: could not fetch the build-data repo. Maybe you do not have the correct permissions?'
+      end
+
+      Dir.chdir(build_data_directory) do
+        [team_data_branch, project_data_branch].each do |branch|
+          %x(git checkout #{branch})
+          unless $?.success?
+            warn "Warning: no build_defaults found in branch '#{branch}' of '#{data_repo}'. Skipping."
+            next
           end
+          Pkg::Util::RakeUtils.invoke_task('pl:load_extras', build_data_directory)
         end
-      else
-        fail "There was an error attempting to fetch the build-data repo. Maybe you do not have the correct permissions?"
       end
     ensure
-      rm_rf temp_build_data_dir
+      rm_rf build_data_directory
     end
+
+    Pkg::Util::RakeUtils.invoke_task('config:validate')
   end
 end

data/tasks/gem.rake

@@ -39,23 +39,24 @@ end
 
 def create_default_gem_spec
   spec = Gem::Specification.new do |s|
-    s.name = Pkg::Config.project                                     unless Pkg::Config.project.nil?
-    s.name = Pkg::Config.gem_name                                    unless Pkg::Config.gem_name.nil?
-    s.version = Pkg::Config.gemversion                               unless Pkg::Config.gemversion.nil?
-    s.author = Pkg::Config.author                                    unless Pkg::Config.author.nil?
-    s.email = Pkg::Config.email                                      unless Pkg::Config.email.nil?
-    s.homepage = Pkg::Config.homepage                                unless Pkg::Config.homepage.nil?
-    s.summary = Pkg::Config.summary                                  unless Pkg::Config.summary.nil?
-    s.summary = Pkg::Config.gem_summary                              unless Pkg::Config.gem_summary.nil?
-    s.description = Pkg::Config.description                          unless Pkg::Config.description.nil?
-    s.description = Pkg::Config.gem_description                      unless Pkg::Config.gem_description.nil?
-    s.files = glob_gem_files                                         unless glob_gem_files.nil?
-    s.executables = Pkg::Config.gem_executables                      unless Pkg::Config.gem_executables.nil?
-    s.require_path = Pkg::Config.gem_require_path                    unless Pkg::Config.gem_require_path.nil?
-    s.required_ruby_version = Pkg::Config.gem_required_ruby_version  unless Pkg::Config.gem_required_ruby_version.nil?
+    s.name = Pkg::Config.project                                            unless Pkg::Config.project.nil?
+    s.name = Pkg::Config.gem_name                                           unless Pkg::Config.gem_name.nil?
+    s.version = Pkg::Config.gemversion                                      unless Pkg::Config.gemversion.nil?
+    s.author = Pkg::Config.author                                           unless Pkg::Config.author.nil?
+    s.email = Pkg::Config.email                                             unless Pkg::Config.email.nil?
+    s.homepage = Pkg::Config.homepage                                       unless Pkg::Config.homepage.nil?
+    s.summary = Pkg::Config.summary                                         unless Pkg::Config.summary.nil?
+    s.summary = Pkg::Config.gem_summary                                     unless Pkg::Config.gem_summary.nil?
+    s.description = Pkg::Config.description                                 unless Pkg::Config.description.nil?
+    s.description = Pkg::Config.gem_description                             unless Pkg::Config.gem_description.nil?
+    s.files = glob_gem_files                                                unless glob_gem_files.nil?
+    s.executables = Pkg::Config.gem_executables                             unless Pkg::Config.gem_executables.nil?
+    s.require_path = Pkg::Config.gem_require_path                           unless Pkg::Config.gem_require_path.nil?
+    s.required_ruby_version = Pkg::Config.gem_required_ruby_version         unless Pkg::Config.gem_required_ruby_version.nil?
     s.required_rubygems_version = Pkg::Config.gem_required_rubygems_version unless Pkg::Config.gem_required_rubygems_version.nil?
-    s.test_files = FileList[Pkg::Config.gem_test_files.split(' ')]   unless Pkg::Config.gem_test_files.nil?
-    s.rubyforge_project = Pkg::Config.gem_forge_project              unless Pkg::Config.gem_forge_project.nil?
+    s.test_files = FileList[Pkg::Config.gem_test_files.split(' ')]          unless Pkg::Config.gem_test_files.nil?
+    s.license = Pkg::Config.gem_license                                     unless Pkg::Config.gem_license.nil?
+    s.rubyforge_project = Pkg::Config.gem_forge_project                     unless Pkg::Config.gem_forge_project.nil?
     Pkg::Config.gem_rdoc_options.each do |option|
       s.rdoc_options << option
     end unless Pkg::Config.gem_rdoc_options.nil?
@@ -150,20 +151,10 @@ namespace :package do
     Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version
     package_gem
   end
-
-  # PA-3356: temporary task to ship puppet 7 nightly gem
-  # TODO: PA-3358 - remove when puppet 7 is officialy out
-  task :puppet_7_nightly_gem => ["clean"] do
-    Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version.gsub(/6\.\d+\.\d+/, '7.0.0')
-    package_gem
-  end
 end
 
 # An alias task to simplify our remote logic in jenkins.rake
 namespace :pl do
   task :gem => "package:gem"
   task :nightly_gem => "package:nightly_gem"
-  # PA-3356: temporary task to ship puppet 7 nightly gem
-  # TODO: PA-3358 - remove when puppet 7 is officialy out
-  task :puppet_7_nightly_gem => "package:puppet_7_nightly_gem"
 end

data/tasks/nightly_repos.rake

@@ -26,10 +26,10 @@ cd #{remote_repo} ;
 #{Pkg::Util::Net.remote_bundle_install_command}
 bundle exec rake pl:jenkins:sign_repos GPG_KEY=#{Pkg::Util::Gpg.key} PARAMS_FILE=#{build_params}
 DOC
-      Pkg::Util::Net.remote_ssh_cmd(signing_server, rake_command)
+      Pkg::Util::Net.remote_execute(signing_server, rake_command)
       Pkg::Util::Net.rsync_from("#{remote_repo}/repos/", signing_server, target)
-      Pkg::Util::Net.remote_ssh_cmd(signing_server, "rm -rf #{remote_repo}")
-      Pkg::Util::Net.remote_ssh_cmd(signing_server, "rm #{build_params}")
+      Pkg::Util::Net.remote_execute(signing_server, "rm -rf #{remote_repo}")
+      Pkg::Util::Net.remote_execute(signing_server, "rm #{build_params}")
       puts "Signed packages staged in '#{target}' directory"
     end
 
@@ -48,7 +48,7 @@ DOC
       target_dir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}/#{target_prefix}_repos"
       Pkg::Util::Execution.retry_on_fail(:times => 3) do
         # Ship the now signed repos to the distribution server
-        Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.distribution_server, "mkdir -p #{target_dir}")
+        Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir -p #{target_dir}")
         Pkg::Util::Net.rsync_to("#{target_prefix}_repos/", Pkg::Config.distribution_server, target_dir)
       end
     end
@@ -244,11 +244,11 @@ DOC
       local_pa_latest = "#{pa_source}-latest"
       local_pe_latest = "#{pe_target}-latest"
 
-      Pkg::Util::Net.remote_ssh_cmd(target_host, "mkdir -p '#{pe_target}'")
-      Pkg::Util::Net.remote_ssh_cmd(target_host, "mkdir -p '#{local_pe_latest}'")
-      Pkg::Util::Net.remote_ssh_cmd(target_host, "cp -r #{local_pa_latest}/* #{local_pe_latest}")
-      Pkg::Util::Net.remote_ssh_cmd(target_host, "sed -i 's|/#{File.basename(local_pa_latest)}|/#{pe_version}/#{File.basename(local_pa_latest)}|' #{local_pe_latest}/repo_configs/*/*")
-      Pkg::Util::Net.remote_ssh_cmd(target_host, "ln -sf '#{local_pa}' '#{local_pe}'")
+      Pkg::Util::Net.remote_execute(target_host, "mkdir -p '#{pe_target}'")
+      Pkg::Util::Net.remote_execute(target_host, "mkdir -p '#{local_pe_latest}'")
+      Pkg::Util::Net.remote_execute(target_host, "cp -r #{local_pa_latest}/* #{local_pe_latest}")
+      Pkg::Util::Net.remote_execute(target_host, "sed -i 's|/#{File.basename(local_pa_latest)}|/#{pe_version}/#{File.basename(local_pa_latest)}|' #{local_pe_latest}/repo_configs/*/*")
+      Pkg::Util::Net.remote_execute(target_host, "ln -sf '#{local_pa}' '#{local_pe}'")
     end
 
     task :nightly_repos => ["pl:fetch"] do