packaging 0.99.3 → 0.99.4

data/lib/packaging/rpm/repo.rb

@@ -75,9 +75,6 @@ module Pkg::Rpm::Repo
       path = Pathname.new(origin_path)
       dest_path = Pathname.new(destination_path)
 
-      # You may think "rsync doesn't actually remove the sticky bit, let's
-      # remove the Dugo-s from the chmod". However, that will make your rsyncs
-      # fail due to permission errors.
       options = %w(
         rsync
         --recursive

data/lib/packaging/util/gpg.rb

@@ -51,6 +51,10 @@ module Pkg::Util::Gpg
       gpg ||= Pkg::Util::Tool.find_tool('gpg')
 
       if gpg
+        if File.exist? "#{file}.asc"
+          warn "Signature on #{file} exists, skipping..."
+          return true
+        end
         use_tty = "--no-tty --use-agent" if ENV['RPM_GPG_AGENT']
         stdout, _, _ = Pkg::Util::Execution.capture3("#{gpg} #{use_tty} --armor --detach-sign -u #{key} #{file}")
         stdout

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)
+  def reorganize_packages(pkgs, tmp, platform_independent = false, nonfinal = 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')
+        path = Pkg::Paths.artifacts_path(platform_tag, 'pkg', nonfinal)
       end
       FileUtils.mkdir_p File.join(tmp, path)
       FileUtils.cp pkg, File.join(tmp, path)
@@ -64,7 +64,8 @@ module Pkg::Util::Ship
     options = {
       excludes: [],
       chattr: true,
-      platform_independent: false }.merge(opts)
+      platform_independent: false,
+      nonfinal: false }.merge(opts)
 
     # First find the packages to be shipped. We must find them before moving
     # to our temporary staging directory
@@ -72,7 +73,7 @@ module Pkg::Util::Ship
     return if local_packages.empty?
 
     tmpdir = Dir.mktmpdir
-    staged_pkgs = reorganize_packages(local_packages, tmpdir, options[:platform_independent])
+    staged_pkgs = reorganize_packages(local_packages, tmpdir, options[:platform_independent], options[:nonfinal])
 
     puts staged_pkgs.sort
     puts "Do you want to ship the above files to (#{staging_server})?"
@@ -105,7 +106,7 @@ module Pkg::Util::Ship
   def ship_rpms(local_staging_directory, remote_path, opts = {})
     ship_pkgs(["#{local_staging_directory}/**/*.rpm", "#{local_staging_directory}/**/*.srpm"], Pkg::Config.yum_staging_server, remote_path, opts)
 
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('el'), Pkg::Config.yum_staging_server, remote_path)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('el'), Pkg::Config.yum_staging_server, remote_path, opts[:nonfinal])
   end
 
   def ship_debs(local_staging_directory, remote_path, opts = {})
@@ -118,7 +119,7 @@ module Pkg::Util::Ship
     # architecture for the code name we're working with at the moment. [written
     # by Melissa, copied by Molly]
     Pkg::Platforms.codenames.each do |codename|
-      create_rolling_repo_link(Pkg::Platforms.codename_to_tags(codename)[0], Pkg::Config.apt_signing_server, remote_path)
+      create_rolling_repo_link(Pkg::Platforms.codename_to_tags(codename)[0], Pkg::Config.apt_signing_server, remote_path, opts[:nonfinal])
     end
   end
 
@@ -133,7 +134,7 @@ module Pkg::Util::Ship
   def ship_dmg(local_staging_directory, remote_path, opts = {})
     ship_pkgs(["#{local_staging_directory}/**/*.dmg"], Pkg::Config.dmg_staging_server, remote_path, opts)
 
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('osx'), Pkg::Config.dmg_staging_server, remote_path)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('osx'), Pkg::Config.dmg_staging_server, remote_path, opts[:nonfinal])
 
     Pkg::Platforms.platform_tags_for_package_format('dmg').each do |platform_tag|
       # TODO remove the PC1 links when we no longer need to maintain them
@@ -148,13 +149,13 @@ module Pkg::Util::Ship
   def ship_swix(local_staging_directory, remote_path, opts = {})
     ship_pkgs(["#{local_staging_directory}/**/*.swix"], Pkg::Config.swix_staging_server, remote_path, opts)
 
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('eos'), Pkg::Config.swix_staging_server, remote_path)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('eos'), Pkg::Config.swix_staging_server, remote_path, opts[:nonfinal])
   end
 
   def ship_msi(local_staging_directory, remote_path, opts = {})
     ship_pkgs(["#{local_staging_directory}/**/*.msi"], Pkg::Config.msi_staging_server, remote_path, opts)
 
-    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('windows'), Pkg::Config.msi_staging_server, remote_path)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('windows'), Pkg::Config.msi_staging_server, remote_path, opts[:nonfinal])
     # Create the symlinks for the latest supported repo
     Pkg::Util::Net.remote_create_latest_symlink('puppet-agent', Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x64')
     Pkg::Util::Net.remote_create_latest_symlink('puppet-agent', Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path), 'msi', arch: 'x86')
@@ -175,8 +176,8 @@ module Pkg::Util::Ship
     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)
-    base_path, link_path = Pkg::Paths.artifacts_base_path_and_link_path(platform_tag, repo_path)
+  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)
 
     if link_path.nil?
       puts "No link target set, not creating rolling repo link for #{base_path}"
@@ -205,8 +206,8 @@ module Pkg::Util::Ship
     CMD
   end
 
-  def create_rolling_repo_link(platform_tag, staging_server, repo_path)
-    command = rolling_repo_link_command(platform_tag, repo_path)
+  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?
   rescue => e

data/spec/fixtures/config/ext/build_defaults.yaml

@@ -0,0 +1 @@
+spec/fixtures/config/ext/../params.yaml

data/spec/fixtures/config/ext/project_data.yaml

@@ -0,0 +1 @@
+spec/fixtures/config/ext/../params.yaml

data/spec/lib/packaging/paths_spec.rb

@@ -67,33 +67,29 @@ describe 'Pkg::Paths' do
 
     it 'should return repo_name for final version' do
       allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
-      allow(Pkg::Util::Version).to receive(:final?).and_return(true)
       expect(Pkg::Paths.repo_name).to eq('puppet5')
     end
 
     it 'should be empty string if repo_name is not set for final version' do
       allow(Pkg::Config).to receive(:repo_name).and_return(nil)
-      allow(Pkg::Util::Version).to receive(:final?).and_return(true)
       expect(Pkg::Paths.repo_name).to eq('')
     end
 
     it 'should return nonfinal_repo_name for non-final version' do
       allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('puppet5-nightly')
-      allow(Pkg::Util::Version).to receive(:final?).and_return(false)
-      expect(Pkg::Paths.repo_name).to eq('puppet5-nightly')
+      expect(Pkg::Paths.repo_name(true)).to eq('puppet5-nightly')
     end
 
-    it 'should return repo_name if nonfinal_repo_name is not set for non-final version' do
+    it 'should fail if nonfinal_repo_name is not set for non-final version' do
       allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
       allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nil)
-      allow(Pkg::Util::Version).to receive(:final?).and_return(false)
-      expect(Pkg::Paths.repo_name).to eq('puppet5')
+      expect { Pkg::Paths.repo_name(true) }.to raise_error
     end
   end
 
   describe '#artifacts_path' do
     before :each do
-      allow(Pkg::Paths).to receive(:repo_name).and_return('puppet5')
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
     end
 
     it 'should be correct for el7' do
@@ -125,7 +121,7 @@ describe 'Pkg::Paths' do
 
   describe '#repo_path' do
     before :each do
-      allow(Pkg::Paths).to receive(:repo_name).and_return('puppet5')
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
     end
 
     it 'should be correct' do
@@ -150,4 +146,93 @@ describe 'Pkg::Paths' do
       end
     end
   end
+
+  describe '#apt_repo_name' do
+    it 'should return `Pkg::Config.repo_name` if set' do
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
+      allow(Pkg::Config).to receive(:apt_repo_name).and_return('PC1')
+      expect(Pkg::Paths.apt_repo_name).to eq('puppet5')
+    end
+
+    it 'should return `Pkg::Config.apt_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(:apt_repo_name).and_return('PC1')
+      expect(Pkg::Paths.apt_repo_name).to eq('PC1')
+    end
+
+    it 'should return \'main\' if nothing is set' do
+      allow(Pkg::Config).to receive(:repo_name).and_return(nil)
+      allow(Pkg::Config).to receive(:apt_repo_name).and_return(nil)
+      expect(Pkg::Paths.apt_repo_name).to eq('main')
+    end
+    it 'should return nonfinal_repo_name for nonfinal version' do
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('puppet5-nightly')
+      expect(Pkg::Paths.apt_repo_name(true)).to eq('puppet5-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('puppet5')
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nil)
+      expect { Pkg::Paths.apt_repo_name(true) }.to raise_error
+    end
+  end
+
+  describe '#yum_repo_name' do
+    it 'should return `Pkg::Config.repo_name` if set' do
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
+      allow(Pkg::Config).to receive(:yum_repo_name).and_return('PC1')
+      expect(Pkg::Paths.yum_repo_name).to eq('puppet5')
+    end
+
+    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('PC1')
+      expect(Pkg::Paths.yum_repo_name).to eq('PC1')
+    end
+
+    it 'should return \'products\' if nothing is set' do
+      allow(Pkg::Config).to receive(:repo_name).and_return(nil)
+      allow(Pkg::Config).to receive(:yum_repo_name).and_return(nil)
+      expect(Pkg::Paths.yum_repo_name).to eq('products')
+    end
+
+    it 'should return nonfinal_repo_name for nonfinal version' do
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return('puppet5-nightly')
+      expect(Pkg::Paths.yum_repo_name(true)).to eq('puppet5-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('puppet5')
+      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nil)
+      expect { Pkg::Paths.yum_repo_name(true) }.to raise_error
+    end
+  end
+
+  describe '#is_legacy_repo?' do
+    it 'returns true for empty strings' do
+      expect(Pkg::Paths.is_legacy_repo?('')).to be_true
+    end
+
+    it 'returns true for PC1' do
+      expect(Pkg::Paths.is_legacy_repo?('PC1')).to be_true
+    end
+
+    it 'returns true for foopuppetbar' do
+      expect(Pkg::Paths.is_legacy_repo?('foopuppetbar')).to be_true
+    end
+
+    it 'returns false for puppet5' do
+      expect(Pkg::Paths.is_legacy_repo?('puppet5')).to be_false
+    end
+
+    it 'returns false for puppet8-nightly' do
+      expect(Pkg::Paths.is_legacy_repo?('puppet8-nightly')).to be_false
+    end
+
+    it 'returns false for puppet' do
+      expect(Pkg::Paths.is_legacy_repo?('puppet')).to be_false
+    end
+  end
 end

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 = ['cumulus', 'debian', 'ubuntu']
-      rpm_platforms = ['aix', 'cisco-wrlinux', 'el', 'fedora', 'redhat-fips', 'sles']
+      rpm_platforms = ['aix', 'cisco-wrlinux', '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
@@ -19,7 +19,7 @@ describe 'Pkg::Platforms' do
 
   describe '#supported_platforms' do
     it 'should return all supported platforms' do
-      platforms = ['aix', 'cisco-wrlinux', 'cumulus', 'debian', 'el', 'eos', 'fedora', 'osx', 'redhat-fips', 'sles', 'solaris', 'ubuntu', 'windows']
+      platforms = ['aix', 'cisco-wrlinux', 'cumulus', 'debian', 'el', 'eos', 'fedora', 'osx', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows']
       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 = ['cumulus', 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial']
+      codenames = ['bionic', 'buster', 'cumulus', 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial']
       expect(Pkg::Platforms.codenames).to match_array(codenames)
     end
   end
@@ -134,7 +134,7 @@ describe 'Pkg::Platforms' do
       'xenial-amd64' => ['ubuntu', '16.04', 'amd64'],
       'xenial' => ['ubuntu', '16.04', ''],
       'windows-2012' => ['windows', '2012', ''],
-      'redhat-fips-7-x86_64' => ['redhat-fips', '7', 'x86_64'],
+      'redhatfips-7-x86_64' => ['redhatfips', '7', 'x86_64'],
       'el-7-SRPMS' => ['el', '7', 'SRPMS'],
       'ubuntu-14.04-source' => ['ubuntu', '14.04', 'source'],
     }

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

@@ -59,7 +59,7 @@ new_pkgs = [
     tmpdir = Dir.mktmpdir
 
     before :each do
-      allow(Pkg::Paths).to receive(:repo_name).and_return('puppet5')
+      allow(Pkg::Config).to receive(:repo_name).and_return('puppet5')
       expect(FileUtils).to receive(:cp).at_least(:once)
     end
 

data/tasks/nightly_repos.rake

@@ -205,7 +205,7 @@ DOC
 
       if args.foss_only && Pkg::Config.foss_platforms && !Pkg::Config.foss_platforms.empty?
         Pkg::Config.foss_platforms.each do |platform|
-          include_paths << Pkg::Paths.repo_path(platform, legacy: true)
+          include_paths << Pkg::Paths.repo_path(platform, legacy: true, nonfinal: true)
           if Pkg::Paths.repo_config_path(platform)
             include_paths << Pkg::Paths.repo_config_path(platform)
           end
@@ -337,7 +337,7 @@ DOC
 
       latest_filename = File.join(latest_filepath, "LATEST")
       File.open(latest_filename, 'w') { |file| file.write(version) }
-      Pkg::Util::Net.s3sync_to(latest_filepath, target_bucket, Pkg::Config.project, ["--acl-public", "--follow-symlinks"])
+      Pkg::Util::Net.s3sync_to(latest_filename, target_bucket, Pkg::Config.project, ["--acl-public", "--follow-symlinks"])
       FileUtils.rm_rf latest_filepath
     end
   end

data/tasks/ship.rake

@@ -10,7 +10,7 @@ namespace :pl do
       command = Pkg::Config.yum_repo_command || 'rake -f /opt/repository/Rakefile mk_repo'
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.yum_staging_server}'? [y,n]"
       if Pkg::Util.ask_yes_or_no
-        Pkg::Repo.update_repo(Pkg::Config.yum_staging_server, command, { :repo_name => Pkg::Config.repo_name, :repo_path => Pkg::Config.yum_repo_path, :repo_host => Pkg::Config.yum_staging_server })
+        Pkg::Repo.update_repo(Pkg::Config.yum_staging_server, command, { :repo_name => Pkg::Paths.yum_repo_name, :repo_path => Pkg::Config.yum_repo_path, :repo_host => Pkg::Config.yum_staging_server })
       end
     end
 
@@ -47,7 +47,7 @@ namespace :pl do
     task update_apt_repo: 'pl:fetch' do
       $stdout.puts "Really run remote repo update on '#{Pkg::Config.apt_signing_server}'? [y,n]"
       if Pkg::Util.ask_yes_or_no
-        Pkg::Repo.update_repo(Pkg::Config.apt_signing_server, Pkg::Config.apt_repo_command, { :repo_name => Pkg::Config.repo_name, :repo_path => Pkg::Config.apt_repo_path, :repo_host => Pkg::Config.apt_host, :repo_url => Pkg::Config.apt_repo_url })
+        Pkg::Repo.update_repo(Pkg::Config.apt_signing_server, Pkg::Config.apt_repo_command, { :repo_name => Pkg::Paths.apt_repo_name, :repo_path => Pkg::Config.apt_repo_path, :repo_host => Pkg::Config.apt_host, :repo_url => Pkg::Config.apt_repo_url })
       end
     end
 
@@ -256,7 +256,7 @@ namespace :pl do
 
   desc "Ship nightly rpms to #{Pkg::Config.yum_staging_server}"
   task ship_nightly_rpms: 'pl:fetch' do
-    Pkg::Util::Ship.ship_rpms('pkg', Pkg::Config.nonfinal_yum_repo_path)
+    Pkg::Util::Ship.ship_rpms('pkg', Pkg::Config.nonfinal_yum_repo_path, nonfinal: true)
   end
 
   desc "Ship cow-built debs to #{Pkg::Config.apt_signing_server}"
@@ -266,7 +266,7 @@ namespace :pl do
 
   desc "Ship nightly debs to #{Pkg::Config.apt_signing_server}"
   task ship_nightly_debs: 'pl:fetch' do
-    Pkg::Util::Ship.ship_debs('pkg', Pkg::Config.nonfinal_apt_repo_staging_path, chattr: false)
+    Pkg::Util::Ship.ship_debs('pkg', Pkg::Config.nonfinal_apt_repo_staging_path, chattr: false, nonfinal: true)
   end
 
   desc 'Ship built gem to rubygems.org, internal Gem mirror, and public file server'
@@ -375,7 +375,7 @@ namespace :pl do
 
   desc "ship nightly apple dmgs to #{Pkg::Config.dmg_staging_server}"
   task ship_nightly_dmg: 'pl:fetch' do
-    Pkg::Util::Ship.ship_dmg('pkg', Pkg::Config.nonfinal_dmg_path)
+    Pkg::Util::Ship.ship_dmg('pkg', Pkg::Config.nonfinal_dmg_path, nonfinal: true)
   end
 
   desc "ship Arista EOS swix packages and signatures to #{Pkg::Config.swix_staging_server}"
@@ -397,7 +397,7 @@ namespace :pl do
 
   desc "ship nightly Arista EOS swix packages and signatures to #{Pkg::Config.swix_staging_server}"
   task ship_nightly_swix: 'pl:fetch' do
-    Pkg::Util::Ship.ship_swix('pkg', Pkg::Config.nonfinal_swix_path)
+    Pkg::Util::Ship.ship_swix('pkg', Pkg::Config.nonfinal_swix_path, nonfinal: true)
   end
 
   desc "ship tarball and signature to #{Pkg::Config.tar_staging_server}"
@@ -436,7 +436,7 @@ namespace :pl do
 
   desc "Ship nightly MSI packages to #{Pkg::Config.msi_staging_server}"
   task ship_nightly_msi: 'pl:fetch' do
-    Pkg::Util::Ship.ship_msi('pkg', Pkg::Config.nonfinal_msi_path, excludes: ["#{Pkg::Config.project}-x(86|64).msi"])
+    Pkg::Util::Ship.ship_msi('pkg', Pkg::Config.nonfinal_msi_path, excludes: ["#{Pkg::Config.project}-x(86|64).msi"], nonfinal: true)
   end
 
   desc 'UBER ship: ship all the things in pkg'

data/tasks/sign.rake

@@ -10,9 +10,13 @@ namespace :pl do
     end
   end
 
+  # If no directory to sign is specified assume "pkg"
+  $DEFAULT_DIRECTORY = "pkg"
+
   desc "Sign the Arista EOS swix packages, defaults to PL key, pass GPG_KEY to override or edit build_defaults"
-  task :sign_swix do
-    packages = Dir["pkg/**/*.swix"]
+  task :sign_swix, :root_dir do |_t, args|
+    swix_dir = args.root_dir || $DEFAULT_DIRECTORY
+    packages = Dir["#{swix_dir}/**/*.swix"]
     unless packages.empty?
       Pkg::Util::Gpg.load_keychain if Pkg::Util::Tool.find_tool('keychain')
       packages.each do |swix_package|
@@ -22,10 +26,11 @@ namespace :pl do
   end
 
   desc "Detach sign any solaris svr4 packages"
-  task :sign_svr4 do
-    unless Dir["pkg/**/*.pkg.gz"].empty?
+  task :sign_svr4, :root_dir do |_t, args|
+    svr4_dir = args.root_dir || $DEFAULT_DIRECTORY
+    unless Dir["#{svr4_dir}/**/*.pkg.gz"].empty?
       Pkg::Util::Gpg.load_keychain if Pkg::Util::Tool.find_tool('keychain')
-      Dir["pkg/**/*.pkg.gz"].each do |pkg|
+      Dir["#{svr4_dir}/**/*.pkg.gz"].each do |pkg|
         Pkg::Util::Gpg.sign_file pkg
       end
     end
@@ -33,7 +38,7 @@ namespace :pl do
 
   desc "Sign mocked rpms, Defaults to PL Key, pass GPG_KEY to override"
   task :sign_rpms, :root_dir do |t, args|
-    rpm_dir = args.root_dir || "pkg"
+    rpm_dir = args.root_dir || $DEFAULT_DIRECTORY
 
     # Create a hash mapping full paths to basenames.
     # This will allow us to keep track of the different paths that may be
@@ -97,13 +102,15 @@ namespace :pl do
   end
 
   desc "Sign ips package, uses PL certificates by default, update privatekey_pem, certificate_pem, and ips_inter_cert in build_defaults.yaml to override."
-  task :sign_ips do
-    Pkg::Sign::Ips.sign unless Dir['pkg/**/*.p5p'].empty?
+  task :sign_ips, :root_dir do |_t, args|
+    ips_dir = args.root_dir || $DEFAULT_DIRECTORY
+    Pkg::Sign::Ips.sign(ips_dir) unless Dir["#{ips_dir}/**/*.p5p"].empty?
   end
 
   desc "Sign built gems, defaults to PL key, pass GPG_KEY to override or edit build_defaults"
-  task :sign_gem do
-    gems = FileList["pkg/*.gem"]
+  task :sign_gem, :root_dir do |_t, args|
+    gems_dir = args.root_dir || $DEFAULT_DIRECTORY
+    gems = FileList["#{gems_dir}/*.gem"]
     gems.each do |gem|
       puts "signing gem #{gem}"
       Pkg::Util::Gpg.sign_file(gem)
@@ -111,9 +118,10 @@ namespace :pl do
   end
 
   desc "Check if all rpms are signed"
-  task :check_rpm_sigs do
+  task :check_rpm_sigs, :root_dir do |_t, args|
+    rpm_dir = args.root_dir || $DEFAULT_DIRECTORY
     signed = TRUE
-    rpms = Dir["pkg/**/*.rpm"]
+    rpms = Dir["#{rpm_dir}/**/*.rpm"]
     print 'Checking rpm signatures'
     rpms.each do |rpm|
       if Pkg::Sign::Rpm.has_sig? rpm
@@ -128,12 +136,13 @@ namespace :pl do
   end
 
   desc "Sign generated debian changes files. Defaults to PL Key, pass GPG_KEY to override"
-  task :sign_deb_changes do
+  task :sign_deb_changes, :root_dir do |_t, args|
     begin
-      change_files = Dir["pkg/**/*.changes"]
+      deb_dir = args.root_dir || $DEFAULT_DIRECTORY
+      change_files = Dir["#{deb_dir}/**/*.changes"]
       unless change_files.empty?
         Pkg::Util::Gpg.load_keychain if Pkg::Util::Tool.find_tool('keychain')
-        Pkg::Sign::Deb.sign_changes("pkg/**/*.changes")
+        Pkg::Sign::Deb.sign_changes("#{deb_dir}/**/*.changes")
       end
     ensure
       Pkg::Util::Gpg.kill_keychain
@@ -141,13 +150,15 @@ namespace :pl do
   end
 
   desc "Sign OSX packages"
-  task :sign_osx => "pl:fetch" do
-    Pkg::Sign::Dmg.sign unless Dir['pkg/**/*.dmg'].empty?
+  task :sign_osx, [:root_dir] => "pl:fetch" do |_t, args|
+    dmg_dir = args.root_dir || $DEFAULT_DIRECTORY
+    Pkg::Sign::Dmg.sign(dmg_dir) unless Dir["#{dmg_dir}/**/*.dmg"].empty?
   end
 
   desc "Sign MSI packages"
-  task :sign_msi => "pl:fetch" do
-    Pkg::Sign::Msi.sign unless Dir['pkg/**/*.msi'].empty?
+  task :sign_msi, [:root_dir] => "pl:fetch" do |_t, args|
+    msi_dir = args.root_dir || $DEFAULT_DIRECTORY
+    Pkg::Sign::Msi.sign(msi_dir) unless Dir["#{msi_dir}/**/*.msi"].empty?
   end
 
   ##
@@ -156,8 +167,10 @@ namespace :pl do
   #
   namespace :jenkins do
     desc "Sign all locally staged packages on #{Pkg::Config.signing_server}"
-    task :sign_all => "pl:fetch" do
-      Dir["pkg/*"].empty? and fail "There were files found in pkg/. Maybe you wanted to build/retrieve something first?"
+    task :sign_all, :root_dir do |_t, args|
+      Pkg::Util::RakeUtils.invoke_task('pl:fetch')
+      root_dir = args.root_dir || $DEFAULT_DIRECTORY
+      Dir["#{root_dir}/*"].empty? and fail "There were no files found in #{root_dir}. Maybe you wanted to build/retrieve something first?"
 
       # Because rpms and debs are laid out differently in PE under pkg/ they
       # have a different sign task to address this. Rather than create a whole
@@ -172,7 +185,7 @@ namespace :pl do
       rpm_sign_task = Pkg::Config.build_pe ? "pe:sign_rpms" : "pl:sign_rpms"
       deb_sign_task = Pkg::Config.build_pe ? "pe:sign_deb_changes" : "pl:sign_deb_changes"
       sign_tasks    = [rpm_sign_task]
-      sign_tasks    << deb_sign_task unless Dir['pkg/**/*.changes'].empty?
+      sign_tasks    << deb_sign_task unless Dir["#{root_dir}/**/*.changes"].empty?
       sign_tasks    << "pl:sign_tar" if Pkg::Config.build_tar
       sign_tasks    << "pl:sign_gem" if Pkg::Config.build_gem
       sign_tasks    << "pl:sign_osx" if Pkg::Config.build_dmg || Pkg::Config.vanagon_project
@@ -182,7 +195,7 @@ namespace :pl do
       sign_tasks    << "pl:sign_msi" if Pkg::Config.build_msi || Pkg::Config.vanagon_project
       remote_repo   = Pkg::Util::Net.remote_bootstrap(Pkg::Config.signing_server, 'HEAD', nil, signing_bundle)
       build_params  = Pkg::Util::Net.remote_buildparams(Pkg::Config.signing_server, Pkg::Config)
-      Pkg::Util::Net.rsync_to('pkg', Pkg::Config.signing_server, remote_repo)
+      Pkg::Util::Net.rsync_to(root_dir, Pkg::Config.signing_server, remote_repo)
       rake_command = <<-DOC
 cd #{remote_repo} ;
 bundle_prefix= ;
@@ -190,13 +203,13 @@ if [[ -r Gemfile ]]; then
   source /usr/local/rvm/scripts/rvm; rvm use ruby-2.3.1; bundle install --path .bundle/gems;
   bundle_prefix='bundle exec';
 fi ;
-$bundle_prefix rake #{sign_tasks.join(' ')} PARAMS_FILE=#{build_params}
+$bundle_prefix rake #{sign_tasks.map { |task| task + "[#{root_dir}]" }.join(" ")} PARAMS_FILE=#{build_params}
 DOC
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, rake_command)
-      Pkg::Util::Net.rsync_from("#{remote_repo}/pkg/", Pkg::Config.signing_server, "pkg/")
+      Pkg::Util::Net.rsync_from("#{remote_repo}/#{root_dir}/", Pkg::Config.signing_server, "#{$DEFAULT_DIRECTORY}/")
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "rm -rf #{remote_repo}")
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.signing_server, "rm #{build_params}")
-      puts "Signed packages staged in 'pkg/ directory"
+      puts "Signed packages staged in #{$DEFAULT_DIRECTORY}/ directory"
     end
   end
-end
+end