packaging 0.99.61 → 0.99.66

data/spec/lib/packaging/platforms_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 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']
+      deb_platforms = ['debian', 'ubuntu']
       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)
@@ -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', 'redhatfips', 'sles', 'solaris', 'ubuntu', 'windows', 'windowsfips']
+      platforms = ['aix', 'cisco-wrlinux', 'debian', 'el', 'eos', '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', 'cumulus', 'wheezy', 'jessie', 'stretch', 'trusty', 'xenial']
+      codenames = ['focal', 'bionic', 'buster', 'cosmic', 'jessie', 'stretch', 'trusty', 'xenial']
       expect(Pkg::Platforms.codenames).to match_array(codenames)
     end
   end
@@ -59,27 +59,27 @@ describe 'Pkg::Platforms' do
 
   describe '#arches_for_codename' do
     it 'should return an array of arches corresponding to a given codename' do
-      expect(Pkg::Platforms.arches_for_codename('trusty')).to match_array(['i386', 'amd64'])
+      expect(Pkg::Platforms.arches_for_codename('xenial')).to match_array(['amd64', 'i386', 'ppc64el'])
     end
 
     it 'should be able to include source archietectures' do
-      expect(Pkg::Platforms.arches_for_codename('trusty', true)).to match_array(['i386', 'amd64', 'source'])
+      expect(Pkg::Platforms.arches_for_codename('xenial', true)).to match_array(["amd64", "i386", "ppc64el", "source"])
     end
   end
 
   describe '#codename_to_tags' do
     it 'should return an array of platform tags corresponding to a given codename' do
-      expect(Pkg::Platforms.codename_to_tags('trusty')).to match_array(['ubuntu-14.04-i386', 'ubuntu-14.04-amd64'])
+      expect(Pkg::Platforms.codename_to_tags('xenial')).to match_array(['ubuntu-16.04-i386', 'ubuntu-16.04-amd64', "ubuntu-16.04-ppc64el"])
     end
   end
 
   describe '#arches_for_platform_version' do
     it 'should return an array of arches for a given platform and version' do
-      expect(Pkg::Platforms.arches_for_platform_version('sles', '11')).to match_array(['i386', 'x86_64', 's390x'])
+      expect(Pkg::Platforms.arches_for_platform_version('sles', '12')).to match_array(['x86_64', 'ppc64le'])
     end
 
     it 'should be able to include source architectures' do
-      expect(Pkg::Platforms.arches_for_platform_version('sles', '11', true)).to match_array(['i386', 'x86_64', 's390x', 'SRPMS'])
+      expect(Pkg::Platforms.arches_for_platform_version('sles', '12', true)).to match_array(["SRPMS", "ppc64le", "x86_64"])
     end
   end
 
@@ -98,12 +98,12 @@ describe 'Pkg::Platforms' do
 
   describe '#platform_lookup' do
     it 'should return a hash of platform info' do
-      expect(Pkg::Platforms.platform_lookup('osx-10.10-x86_64')).to be_instance_of(Hash)
+      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.10-x86_64').keys).to include(:architectures)
-      expect(Pkg::Platforms.platform_lookup('osx-10.10-x86_64').keys).to include(:package_format)
+      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
   end
 
@@ -137,7 +137,7 @@ describe 'Pkg::Platforms' do
       'windows-2012' => ['windows', '2012', ''],
       'redhatfips-7-x86_64' => ['redhatfips', '7', 'x86_64'],
       'el-7-SRPMS' => ['el', '7', 'SRPMS'],
-      'ubuntu-14.04-source' => ['ubuntu', '14.04', 'source'],
+      'ubuntu-16.04-source' => ['ubuntu', '16.04', 'source'],
     }
 
     fail_cases = [

data/spec/lib/packaging/retrieve_spec.rb

@@ -12,7 +12,7 @@ describe 'Pkg::Retrieve' do
     'aix-6.1-power' => {:artifact => './aix/6.1/PC1/ppc/puppet-agent-5.3.2.155.gb25e649-1.aix6.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'},
-    'sles-11-s390x' => {:artifact => './sles/11/PC1/s390x/puppet-agent-5.3.2.155.gb25e649-1.sles11.s390x.rpm'},
+    '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'},
     'windows-2012-x64' => {:artifact => './windows/puppet-agent-x64.msi'},

data/spec/lib/packaging/sign_spec.rb

@@ -74,7 +74,6 @@ DOC
       ] }
       let(:v4_rpms) { [
         "#{rpm_directory}/el/7/PC1/aarch64/puppet-agent-5.5.3-1.el7.aarch64.rpm",
-        "#{rpm_directory}/sles/12/PC1/s390x/puppet-agent-5.5.3-1.sles12.s390x.rpm",
       ] }
       let(:rpms) { rpms_not_to_sign + v3_rpms + v4_rpms }
       let(:already_signed_rpms) { [

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

@@ -43,25 +43,21 @@ describe '#Pkg::Util::Ship' do
   end
 
 local_pkgs = [
-  'pkg/deb/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb',
-  'pkg/deb/wheezy/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1wheezy_i386.deb',
+  'pkg/deb/stretch/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1stretch_i386.deb',
   'pkg/el/5/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.el5.x86_64.rpm',
   'pkg/sles/11/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.sles11.i386.rpm',
   'pkg/sles/12/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.sles12.x86_64.rpm',
   'pkg/mac/10.15/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.15.dmg',
-  'pkg/mac/10.10/puppet5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.10.dmg',
   'pkg/eos/4/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
   'pkg/eos/4/puppet5/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
   'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',
 ]
 new_pkgs = [
-  'pkg/cumulus/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1cumulus_amd64.deb',
-  'pkg/wheezy/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1wheezy_i386.deb',
+  'pkg/stretch/puppet5/puppet-agent_1.4.1.2904.g8023dd1-1stretch_i386.deb',
   'pkg/puppet5/el/5/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.el5.x86_64.rpm',
   'pkg/puppet5/sles/11/i386/puppet-agent-1.4.1.2904.g8023dd1-1.sles11.i386.rpm',
   'pkg/puppet5/sles/12/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.sles12.x86_64.rpm',
   'pkg/mac/puppet5/10.15/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.15.dmg',
-  'pkg/mac/puppet5/10.10/x86_64/puppet-agent-1.4.1.2904.g8023dd1-1.osx10.10.dmg',
   'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix',
   'pkg/eos/puppet5/4/i386/puppet-agent-1.4.1.2904.g8023dd1-1.eos4.i386.swix.asc',
   'pkg/windows/puppet5/puppet-agent-1.4.1.2904.g8023dd1-x86.msi',

data/tasks/ship.rake

@@ -368,46 +368,26 @@ namespace :pl do
 
   desc "ship apple dmg to #{Pkg::Config.dmg_staging_server}"
   task ship_dmg: 'pl:fetch' do
-    # TODO: realistically, this shouldn't be here. This block needs to be
-    # removed, but only when we can successfully modify all instances of
-    # this to be set to '/opt/downloads'. In the meantime, we need to write
-    # this terrible workaround to ensure backward compatibility.
-    #
-    # I'm so sorry
-    # ~MAS 2017-08-14
-    if Pkg::Config.dmg_path == "/opt/downloads/mac"
-      path = "/opt/downloads"
-    else
-      path = Pkg::Config.dmg_path
-    end
+    path = Pkg::Paths.remote_repo_base(package_format: 'dmg')
     Pkg::Util::Ship.ship_dmg('pkg', path)
   end
 
   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, nonfinal: true)
+    path = Pkg::Paths.remote_repo_base(package_format: 'dmg', nonfinal: true)
+    Pkg::Util::Ship.ship_dmg('pkg', path, nonfinal: true)
   end
 
   desc "ship Arista EOS swix packages and signatures to #{Pkg::Config.swix_staging_server}"
   task ship_swix: 'pl:fetch' do
-    # TODO: realistically, this shouldn't be here. This block needs to be
-    # removed, but only when we can successfully modify all instances of
-    # this to be set to '/opt/downloads'. In the meantime, we need to write
-    # this terrible workaround to ensure backward compatibility.
-    #
-    # I'm so sorry
-    # ~MAS 2017-08-14
-    if Pkg::Config.swix_path == "/opt/downloads/eos"
-      path = "/opt/downloads"
-    else
-      path = Pkg::Config.swix_path
-    end
+    path = Pkg::Paths.remote_repo_base(package_format: 'swix')
     Pkg::Util::Ship.ship_swix('pkg', path)
   end
 
   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, nonfinal: true)
+    path = Pkg::Paths.remote_repo_base(package_format: 'swix', nonfinal: true)
+    Pkg::Util::Ship.ship_swix('pkg', path, nonfinal: true)
   end
 
   desc "ship tarball and signature to #{Pkg::Config.tar_staging_server}"
@@ -429,24 +409,14 @@ namespace :pl do
 
   desc "Ship MSI packages to #{Pkg::Config.msi_staging_server}"
   task ship_msi: 'pl:fetch' do
-    # TODO: realistically, this shouldn't be here. This block needs to be
-    # removed, but only when we can successfully modify all instances of
-    # this to be set to '/opt/downloads'. In the meantime, we need to write
-    # this terrible workaround to ensure backward compatibility.
-    #
-    # I'm so sorry
-    # ~MAS 2017-08-14
-    if Pkg::Config.msi_path == "/opt/downloads/windows"
-      path = "/opt/downloads"
-    else
-      path = Pkg::Config.msi_path
-    end
+    path = Pkg::Paths.remote_repo_base(package_format: 'msi')
     Pkg::Util::Ship.ship_msi('pkg', path, excludes: ["#{Pkg::Config.project}-x(86|64).msi"])
   end
 
   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"], nonfinal: true)
+    path = Pkg::Paths.remote_repo_base(package_format: 'msi', nonfinal: true)
+    Pkg::Util::Ship.ship_msi('pkg', path, excludes: ["#{Pkg::Config.project}-x(86|64).msi"], nonfinal: true)
   end
 
   desc "Add #{Pkg::Config.project} version #{Pkg::Config.ref} to release-metrics"
@@ -546,6 +516,16 @@ namespace :pl do
         puts " * #{err}"
       end
     end
+
+    desc 'Create the rolling repo links'
+    task create_repo_links: 'pl:fetch' do
+      Pkg::Util::Ship.create_rolling_repo_links
+    end
+
+    desc 'Create rolling repo links for nightlies'
+    task create_nightly_repo_links: 'pl:fetch' do
+      Pkg::Util::Ship.create_rolling_repo_links(true)
+    end
   end
 
   # It is odd to namespace this ship task under :jenkins, but this task is

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.99.61
+  version: 0.99.66
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -107,6 +107,7 @@ files:
 - lib/packaging.rb
 - lib/packaging/archive.rb
 - lib/packaging/artifactory.rb
+- lib/packaging/artifactory/extensions.rb
 - lib/packaging/config.rb
 - lib/packaging/config/params.rb
 - lib/packaging/deb.rb
@@ -244,28 +245,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/paths_spec.rb
 - spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/sign_spec.rb
 - spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/tar_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/file_spec.rb
 - spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
 - spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging_spec.rb