packaging 0.88.77 → 0.99.0

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_execute).with(Pkg::Config.distribution_server, command)
+      Pkg::Util::Net.should_receive(:remote_ssh_cmd).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_execute).with(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock" )
+      Pkg::Util::Net.should_receive(:remote_ssh_cmd).with(Pkg::Config.distribution_server, "rm -f #{artifact_directory}/repos/.lock" )
       Pkg::Deb::Repo.create_repos
     end
   end
@@ -114,8 +114,8 @@ describe "Pkg::Deb::Repo" do
       Pkg::Config.distribution_server = "a.host.that.wont.exist"
       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_execute).with(Pkg::Config.distribution_server, "mkdir -p #{repo_dir}")
+      Pkg::Deb::Repo.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::Execution.should_receive(:retry_on_fail).with(:times => 3)
       Pkg::Deb::Repo.ship_repo_configs
     end
@@ -128,21 +128,12 @@ describe "Pkg::Deb::Repo" do
     end
 
     it "makes a repo for each dist" do
-      # stub out start_keychain to prevent actual keychain starts.
-      Pkg::Util::Gpg.stub(:start_keychain)
-
       dists = cows.reject { |cow| cow.empty? }
       distfiles = {}
+      reprepro = "/bin/reprepro"
       Pkg::Util::File.should_receive(:directories).with("repos/apt").and_return(dists)
-
-      # Let the keychain command happen if find_tool('keychain') finds it
-      keychain_command = "/usr/bin/keychain -k mine"
-      allow(Pkg::Util::Execution).to receive(:capture3) { keychain_command }
-
-      # Enforce reprepro
-      reprepro_command = "/bin/reprepro"
-      Pkg::Util::Tool.should_receive(:check_tool).with("reprepro").and_return(reprepro_command)
-      Pkg::Util::Execution.should_receive(:capture3).at_least(1).times.with("#{reprepro_command} -vvv --confdir ./conf --dbdir ./db --basedir ./ export")
+      Pkg::Util::Tool.should_receive(:check_tool).with("reprepro").and_return(reprepro)
+      Pkg::Util::Execution.should_receive(:capture3).at_least(1).times.with("#{reprepro} -vvv --confdir ./conf --dbdir ./db --basedir ./ export")
 
       dists.each do |dist|
         distfiles[dist] = double

data/spec/lib/packaging/paths_spec.rb

@@ -3,38 +3,43 @@ require 'spec_helper'
 describe 'Pkg::Paths' do
   describe '#arch_from_artifact_path' do
     arch_transformations = {
-      ['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/aix/6.1/PC1/ppc/puppet-agent-5.1.0.79.g782e03c-1.aix6.1.ppc.rpm', 'aix', '6.1'] => 'power',
+      ['pkg/el-7-x86_64/puppet-agent-4.99.0-1.el7.x86_64.rpm', 'el', '7'] => 'x86_64',
       ['artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz', 'ubuntu', '16.04'] => 'source',
+      ['http://saturn.puppetlabs.net/deb_repos/1234abcd/repos/apt/xenial', 'ubuntu', '16.04'] => 'i386',
+      ['pkg/ubuntu-16.04-amd64/puppet-agent_4.99.0-1xenial_amd64.deb', 'ubuntu', '16.04'] => 'amd64',
       ['artifacts/deb/jessie/PC1/puppetserver_5.0.1.master.orig.tar.gz', 'debian', '8'] => 'source',
       ['artifacts/el/6/PC1/SRPMS/puppetserver-5.0.1.master-0.1SNAPSHOT.2017.08.18T0951.el6.src.rpm', 'el', '6'] => 'SRPMS'
     }
     arch_transformations.each do |path_array, arch|
       it "should correctly return #{arch} for #{path_array[0]}" do
-        expect(Pkg::Paths.arch_from_artifact_path(path_array[1], path_array[2], path_array[0]))
-          .to eq(arch)
+        expect(Pkg::Paths.arch_from_artifact_path(path_array[1], path_array[2], path_array[0])).to eq(arch)
       end
     end
   end
 
   describe '#tag_from_artifact_path' do
     path_tranformations = {
-      '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',
+      'artifacts/aix/6.1/PC1/ppc/puppet-agent-5.1.0.79.g782e03c-1.aix6.1.ppc.rpm' => 'aix-6.1-power',
+      'pkg/el-7-x86_64/puppet-agent-4.99.0-1.el7.x86_64.rpm' => 'el-7-x86_64',
+      'pkg/ubuntu-16.04-amd64/puppet-agent_4.99.0-1xenial_amd64.deb' => 'ubuntu-16.04-amd64',
+      'pkg/windows-x64/puppet-agent-4.99.0-x64.msi' => 'windows-2012-x64',
       'artifacts/el/6/products/x86_64/pe-r10k-2.5.4.3-1.el6.x86_64.rpm' => 'el-6-x86_64',
+      'pkg/deb/trusty/pe-r10k_2.5.4.3-1trusty_amd64.deb' => 'ubuntu-14.04-amd64',
       'pkg/pe/rpm/el-6-i386/pe-puppetserver-2017.3.0.3-1.el6.noarch.rpm' => 'el-6-i386',
-      'pkg/deb/bionic/pe-r10k_3.5.2.0-1bionic_amd64.deb' => 'ubuntu-18.04-amd64',
-      'pkg/deb/buster/pe-r10k_3.5.2.0-1buster_amd64.deb' => 'debian-10-amd64',
-      '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/pe/deb/xenial/pe-puppetserver_2017.3.0.3-1puppet1_all.deb' => 'ubuntu-16.04-i386',
+      'pkg/pe/deb/xenial/super-trusty-package_1.0.0-1puppet1_all.deb' => 'ubuntu-16.04-i386',
+      'artifacts/deb/wheezy/PC1/puppetdb_4.3.1-1puppetlabs1_all.deb' => 'debian-7-i386',
+      'pkg/el/7/PC1/x86_64/puppetdb-4.3.1-1.el7.noarch.rpm' => 'el-7-x86_64',
+      'pkg/apple/10.11/PC1/x86_64/puppet-agent-1.9.0-1.osx10.11.dmg' => 'osx-10.11-x86_64',
+      'artifacts/mac/10.11/PC1/x86_64/puppet-agent-1.9.0-1.osx10.11.dmg' => 'osx-10.11-x86_64',
+      'artifacts/eos/4/PC1/i386/puppet-agent-1.9.0-1.eos4.i386.swix' => 'eos-4-i386',
+      'pkg/deb/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb' => 'cumulus-2.2-amd64',
       'pkg/windows/puppet-agent-1.9.0-x86.msi' => 'windows-2012-x86',
+      'artifacts/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz' => 'ubuntu-16.04-source',
+      'http://saturn.puppetlabs.net/deb_repos/1234abcd/repos/apt/xenial' => 'ubuntu-16.04-i386',
+      'http://builds.puppetlabs.lan/puppet-agent/0ce4e6a0448366e01537323bbab77f834d7035c7/repos/el/6/PC1/x86_64/' => 'el-6-x86_64',
+      'http://builds.puppetlabs.lan/puppet-agent/0ce4e6a0448366e01537323bbab77f834d7035c7/repos/el/6/PC1/x86_64/' => 'el-6-x86_64',
       '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',
       'pkg/puppet-agent-5.1.0.79.g782e03c.gem' => nil,
@@ -59,105 +64,72 @@ describe 'Pkg::Paths' do
   end
 
   describe '#repo_name' do
-    it 'should return repo_name for final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
-      expect(Pkg::Paths.repo_name).to eq('puppet6')
-    end
 
     it 'should return repo_name for final version' do
-      allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
-      expect(Pkg::Paths.repo_name).to eq('FUTURE-puppet7')
+      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('puppet6-nightly')
-      expect(Pkg::Paths.repo_name(true)).to eq('puppet6-nightly')
+      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')
     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('puppet6')
+    it 'should return repo_name 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.repo_name(true) }.to raise_error
+      allow(Pkg::Util::Version).to receive(:final?).and_return(false)
+      expect(Pkg::Paths.repo_name).to eq('puppet5')
     end
   end
 
   describe '#artifacts_path' do
-    context 'all puppet versions' do
-      before :each do
-        allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
-      end
-
-      it 'should work on all current platforms' do
-        Pkg::Platforms.platform_tags.each do |tag|
-          expect { Pkg::Paths.artifacts_path(tag) }.not_to raise_error
-        end
-      end
+    before :each do
+      allow(Pkg::Paths).to receive(:repo_name).and_return('puppet5')
     end
 
-    context 'for puppet 6 and prior' do
-      before :each do
-        allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
-      end
-
-      it 'should be correct for el7' do
-        expect(Pkg::Paths.artifacts_path('el-7-x86_64'))
-          .to eq('artifacts/puppet6/el/7/x86_64')
-      end
-
-      it 'should be correct for bionic' do
-        expect(Pkg::Paths.artifacts_path('ubuntu-18.04-amd64'))
-          .to eq('artifacts/bionic/puppet6')
-      end
-
-      it 'should be correct for solaris 11' do
-        expect(Pkg::Paths.artifacts_path('solaris-11-sparc'))
-          .to eq('artifacts/solaris/puppet6/11')
-      end
+    it 'should be correct for el7' do
+      expect(Pkg::Paths.artifacts_path('el-7-x86_64')).to eq('artifacts/puppet5/el/7/x86_64')
+    end
 
-      it 'should be correct for osx' do
-        expect(Pkg::Paths.artifacts_path('osx-10.15-x86_64'))
-          .to eq('artifacts/mac/puppet6/10.15/x86_64')
-      end
+    it 'should be correct for trusty' do
+      expect(Pkg::Paths.artifacts_path('ubuntu-14.04-amd64')).to eq('artifacts/trusty/puppet5')
+    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 solaris 11' do
+      expect(Pkg::Paths.artifacts_path('solaris-11-sparc')).to eq('artifacts/solaris/puppet5/11')
+    end
 
-      it 'should be correct for windows' do
-        expect(Pkg::Paths.artifacts_path('windows-2012-x64'))
-          .to eq('artifacts/windows/puppet6')
-      end
+    it 'should be correct for osx' do
+      expect(Pkg::Paths.artifacts_path('osx-10.10-x86_64')).to eq('artifacts/mac/puppet5/10.10/x86_64')
     end
 
-    context 'after puppet 7 apt changes' do
-      before :each do
-        allow(Pkg::Config).to receive(:repo_name).and_return('FUTURE-puppet7')
-      end
+    it 'should be correct for windows' do
+      expect(Pkg::Paths.artifacts_path('windows-2012-x64')).to eq('artifacts/windows/puppet5')
+    end
 
-      it 'should be correct for bionic' do
-        expect(Pkg::Paths.artifacts_path('ubuntu-18.04-amd64'))
-          .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/FUTURE-puppet7/focal')
+    it 'should work on all current platforms' do
+      Pkg::Platforms.platform_tags.each do |tag|
+        expect { Pkg::Paths.artifacts_path(tag) }.not_to raise_error
       end
     end
   end
 
   describe '#repo_path' do
     before :each do
-      allow(Pkg::Config).to receive(:repo_name).and_return('puppet6')
+      allow(Pkg::Paths).to receive(:repo_name).and_return('puppet5')
     end
 
     it 'should be correct' do
-      expect(Pkg::Paths.repo_path('el-7-x86_64')).to eq('repos/puppet6/el/7/x86_64')
+      expect(Pkg::Paths.repo_path('el-7-x86_64')).to eq('repos/puppet5/el/7/x86_64')
     end
 
     it 'should work on all current platforms' do
@@ -168,16 +140,8 @@ describe 'Pkg::Paths' do
   end
 
   describe '#repo_config_path' do
-    it 'should construct rpm/deb-specific repo configs' do
-      expect(Pkg::Paths.repo_config_path('el-7-x86_64'))
-        .to eq('repo_configs/rpm/*el-7-x86_64*.repo')
-      expect(Pkg::Paths.repo_config_path('ubuntu-18.04-amd64'))
-        .to eq('repo_configs/deb/*bionic*.list')
-    end
-
-    it 'should raise a RuntimeError with unfamilar repo configs' do
-      expect { Pkg::Paths.repo_config_path('bogus') }
-        .to raise_error(/Could not verify that 'bogus' is a valid tag/)
+    it 'should be correct' do
+      expect(Pkg::Paths.repo_config_path('el-7-x86_64')).to eq('repo_configs/rpm/*el-7-x86_64*.repo')
     end
 
     it 'should work on all current platforms' do
@@ -186,233 +150,4 @@ 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('puppet6')
-      allow(Pkg::Config).to receive(:apt_repo_name).and_return('stuff')
-      expect(Pkg::Paths.apt_repo_name).to eq('puppet6')
-    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('puppet6')
-      expect(Pkg::Paths.apt_repo_name).to eq('puppet6')
-    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('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('FUTURE-puppet7')
-      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('puppet6')
-      allow(Pkg::Config).to receive(:yum_repo_name).and_return('stuff')
-      expect(Pkg::Paths.yum_repo_name).to eq('puppet6')
-    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('FUTURE-puppet7')
-      expect(Pkg::Paths.yum_repo_name).to eq('FUTURE-puppet7')
-    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('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('FUTURE-puppet7')
-      allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nil)
-      expect { Pkg::Paths.yum_repo_name(true) }.to raise_error
-    end
-  end
-
-  describe '#remote_repo_base' do
-    fake_yum_repo_path = '/fake/yum'
-    fake_yum_nightly_repo_path = '/fake/yum-nightly'
-    fake_apt_repo_path = '/fake/apt'
-    fake_apt_nightly_repo_path = '/fake/apt-nightly'
-
-    before :each do
-      allow(Pkg::Config).to receive(:yum_repo_path).and_return(fake_yum_repo_path)
-      allow(Pkg::Config).to receive(:apt_repo_path).and_return(fake_apt_repo_path)
-      allow(Pkg::Config).to receive(:dmg_path).and_return('/opt/downloads/mac')
-      allow(Pkg::Config).to receive(:nonfinal_yum_repo_path).and_return(fake_yum_nightly_repo_path)
-      allow(Pkg::Config).to receive(:nonfinal_apt_repo_path).and_return(fake_apt_nightly_repo_path)
-    end
-    it 'returns yum_repo_path for rpms' do
-      expect(Pkg::Paths.remote_repo_base('el-7-x86_64'))
-        .to eq(fake_yum_repo_path)
-    end
-    it 'returns apt_repo_path for debs' do
-      expect(Pkg::Paths.remote_repo_base('ubuntu-18.04-amd64'))
-        .to eq(fake_apt_repo_path)
-    end
-    it 'returns nonfinal_yum_repo_path for nonfinal rpms' do
-      expect(Pkg::Paths.remote_repo_base('fedora-31-x86_64', nonfinal: true))
-        .to eq(fake_yum_nightly_repo_path)
-    end
-    it 'returns nonfinal_apt_repo_path for nonfinal debs' do
-      expect(Pkg::Paths.remote_repo_base('debian-9-amd64', nonfinal: true))
-        .to eq(fake_apt_nightly_repo_path)
-    end
-    it 'fails if neither tag nor package_format is provided' do
-      expect { Pkg::Paths.remote_repo_base }
-        .to raise_error(/Pkg::Paths.remote_repo_base must have/)
-    end
-
-    it 'returns /opt/downloads if the path is /opt/downloads/<something>' do
-      expect(Pkg::Paths.remote_repo_base(package_format: 'dmg')).to eq('/opt/downloads')
-    end
-
-    it 'fails for all other package formats' do
-      expect { Pkg::Paths.remote_repo_base('solaris-11-i386') }
-        .to raise_error(/Can't determine remote repo base path/)
-    end
-  end
-
-  describe '#apt_package_base_path' do
-    it 'fails for non-debian platforms' do
-      expect { Pkg::Paths.apt_package_base_path('el-7-x86_64', 'puppet6', 'puppet-agent') }
-        .to raise_error(/Can't determine path for non-debian platform/)
-    end
-
-    context 'for puppet 6 and prior' 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', 'puppet6', 'puppet-agent'))
-          .to eq('/opt/repository/apt/pool/bionic/puppet6/p/puppet-agent')
-        expect(Pkg::Paths.apt_package_base_path('debian-9-amd64', 'puppet6', 'bolt-server'))
-          .to eq('/opt/repository/apt/pool/stretch/puppet6/b/bolt-server')
-
-
-      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('ubuntu-18.04-amd64', 'puppet6-nightly',
-                                                'puppet-agent', true))
-          .to eq('/opt/repository-nightlies/apt/pool/bionic/puppet6-nightly/p/puppet-agent')
-        expect(Pkg::Paths.apt_package_base_path('debian-10-amd64', 'puppet6-nightly',
-                                                'pdk', true))
-          .to eq('/opt/repository-nightlies/apt/pool/buster/puppet6-nightly/p/pdk')
-      end
-    end
-
-    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', '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', 'FUTURE-puppet7-nightly', 'pdk', true))
-          .to eq('/opt/repository-nightlies/apt/FUTURE-puppet7-nightly/pool/buster/p/pdk')
-      end
-    end
-  end
-
-  describe '#release_package_link_path' do
-    context 'for puppet 6' do
-      repo_name = 'puppet6'
-      nonfinal_repo_name = 'puppet6-nightly'
-      yum_repo_path = '/opt/repository/yum'
-      apt_repo_path = '/opt/repository/apt'
-      nonfinal_yum_repo_path = '/opt/repository-nightlies/yum'
-      nonfinal_apt_repo_path = '/opt/repository-nightlies/apt'
-      before :each do
-        allow(Pkg::Config).to receive(:repo_name).and_return(repo_name)
-        allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nonfinal_repo_name)
-        allow(Pkg::Config).to receive(:yum_repo_path).and_return(yum_repo_path)
-        allow(Pkg::Config).to receive(:apt_repo_path).and_return(apt_repo_path)
-        allow(Pkg::Config).to receive(:nonfinal_yum_repo_path).and_return(nonfinal_yum_repo_path)
-        allow(Pkg::Config).to receive(:nonfinal_apt_repo_path).and_return(nonfinal_apt_repo_path)
-      end
-      it 'returns the appropriate link path for rpm release packages' do
-        expect(Pkg::Paths.release_package_link_path('sles-12-ppc64le'))
-          .to eq("#{yum_repo_path}/#{repo_name}-release-sles-12.noarch.rpm")
-      end
-      it 'returns the appropriate link path for deb release packages' do
-        expect(Pkg::Paths.release_package_link_path('ubuntu-16.04-amd64'))
-          .to eq("#{apt_repo_path}/#{repo_name}-release-xenial.deb")
-      end
-      it 'returns the appropriate link path for nonfinal rpm release packages' do
-        expect(Pkg::Paths.release_package_link_path('el-7-x86_64', true))
-          .to eq("#{nonfinal_yum_repo_path}/#{nonfinal_repo_name}-release-el-7.noarch.rpm")
-      end
-      it 'returns the appropriate link path for nonfinal deb release packages' do
-        expect(Pkg::Paths.release_package_link_path('debian-9-i386', true))
-          .to eq("#{nonfinal_apt_repo_path}/#{nonfinal_repo_name}-release-stretch.deb")
-      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 = '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'
-      nonfinal_apt_repo_path = '/opt/repository-nightlies/apt'
-      before :each do
-        allow(Pkg::Config).to receive(:repo_name).and_return(repo_name)
-        allow(Pkg::Config).to receive(:nonfinal_repo_name).and_return(nonfinal_repo_name)
-        allow(Pkg::Config).to receive(:yum_repo_path).and_return(yum_repo_path)
-        allow(Pkg::Config).to receive(:apt_repo_path).and_return(apt_repo_path)
-        allow(Pkg::Config).to receive(:nonfinal_yum_repo_path).and_return(nonfinal_yum_repo_path)
-        allow(Pkg::Config).to receive(:nonfinal_apt_repo_path).and_return(nonfinal_apt_repo_path)
-      end
-      it 'returns the appropriate link path for rpm release packages' do
-        expect(Pkg::Paths.release_package_link_path('sles-12-ppc64le'))
-          .to eq("#{yum_repo_path}/#{repo_name}-release-sles-12.noarch.rpm")
-      end
-      it 'returns the appropriate link path for deb release packages' do
-        expect(Pkg::Paths.release_package_link_path('ubuntu-20.04-amd64'))
-          .to eq("#{apt_repo_path}/#{repo_name}-release-focal.deb")
-      end
-      it 'returns the appropriate link path for nonfinal rpm release packages' do
-        expect(Pkg::Paths.release_package_link_path('el-8-x86_64', true))
-          .to eq("#{nonfinal_yum_repo_path}/#{nonfinal_repo_name}-release-el-8.noarch.rpm")
-      end
-      it 'returns the appropriate link path for nonfinal deb release packages' do
-        expect(Pkg::Paths.release_package_link_path('debian-10-i386', true))
-          .to eq("#{nonfinal_apt_repo_path}/#{nonfinal_repo_name}-release-buster.deb")
-      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
-  end
 end