packaging 0.99.65 → 0.99.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e2d980f6d0a3108046057e9a0637b58547bd2e68a16ab3004f9d08f7536b2c7
-  data.tar.gz: 2ac12f3edd599dfbfa9a4af501e833a12685a1efd31c17a9f176af7197aba79f
+  metadata.gz: 47aedaa86f3b67d8c5c0dac793bdc7ba76098d59a69a371d686ad040a82bcad7
+  data.tar.gz: 46903f549c65511da61bc15448809e2442d8569b9cc7c318b3a44c9d1389a4a8
 SHA512:
-  metadata.gz: a6bbad34de17a6da0e1168dafc780fb6a1eedd3106cc04493aa6d0c21839852a01f3b9be33dbae817e7d0c483cb446b96a991efe2aca3b7f6ebd9ad3eb8b82d4
-  data.tar.gz: 7d2d02b9039b9be3eff34fa066b573e5b7adb82e5515aaf23fa08ea72badada429229005c9ac58116daf1bf2c4ed132f9a1618db8eb1798b5581589cf13a2019
+  metadata.gz: 2a4f6a1f1135c242cb3561b609943a44715f9bbf45653f76548c2682819dbf14c1a1f1909380a70b7c5b054eebbd871c0572760c8d76e104fae19b9fedb330d5
+  data.tar.gz: 69bb9b00a3e3711911fc98a4b68d175f9e79553e4c100db4a02ab4e57be3a6ed71c00b0014b19ff5ef5c30c22796e22db73efff32f9775ddf05b9204c12c6885

data/lib/packaging/paths.rb

@@ -151,7 +151,7 @@ module Pkg::Paths
     when 'dmg'
       return File.join(prefix, 'mac', link)
     when 'msi'
-      return File.join(prefix, platform, link)
+      return File.join(prefix, platform_name, link)
     else
       raise "Error: Unknown package format '#{package_format}'"
     end
@@ -261,16 +261,33 @@ module Pkg::Paths
     end
   end
 
-  def remote_repo_base(platform_tag, nonfinal = false)
-    package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
-    case package_format
+  def remote_repo_base(platform_tag = nil, nonfinal: false, package_format: nil)
+    if platform_tag.nil? && package_format.nil?
+      raise "Pkg::Paths.remote_repo_base must have `platform_tag` or `package_format` specified."
+    end
+
+    package_format ||= Pkg::Platforms.package_format_for_tag(platform_tag)
+
+    repo_base = case package_format
     when 'rpm'
       nonfinal ? Pkg::Config.nonfinal_yum_repo_path : Pkg::Config.yum_repo_path
     when 'deb'
       nonfinal ? Pkg::Config.nonfinal_apt_repo_path : Pkg::Config.apt_repo_path
+    when 'dmg'
+      nonfinal ? Pkg::Config.nonfinal_dmg_path : Pkg::Config.dmg_path
+    when 'swix'
+      nonfinal ? Pkg::Config.nonfinal_swix_path : Pkg::Config.swix_path
+    when 'msi'
+      nonfinal ? Pkg::Config.nonfinal_msi_path : Pkg::Config.msi_path
     else
       raise "Can't determine remote repo base path for package format '#{package_format}'."
     end
+
+    # normalize the path for things shipping to the downloads server
+    if repo_base.match(/^\/opt\/downloads\/\w+$/)
+      repo_base = '/opt/downloads'
+    end
+    repo_base
   end
 
   # This is where deb packages end up after freight repo updates
@@ -278,7 +295,7 @@ module Pkg::Paths
     fail "Can't determine path for non-debian platform #{platform_tag}." unless Pkg::Platforms.package_format_for_tag(platform_tag) == 'deb'
     platform, version, _ = Pkg::Platforms.parse_platform_tag(platform_tag)
     codename = Pkg::Platforms.codename_for_platform_version(platform, version)
-    return File.join(remote_repo_base(platform_tag, nonfinal), 'pool', codename, repo_name, project[0], project)
+    return File.join(remote_repo_base(platform_tag, nonfinal: nonfinal), 'pool', codename, repo_name, project[0], project)
   end
 
   def release_package_link_path(platform_tag, nonfinal = false)
@@ -286,10 +303,10 @@ module Pkg::Paths
     package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
     case package_format
     when 'rpm'
-      return File.join(remote_repo_base(platform_tag, nonfinal), "#{repo_name(nonfinal)}-release-#{platform}-#{version}.noarch.rpm")
+      return File.join(remote_repo_base(platform_tag, nonfinal: nonfinal), "#{repo_name(nonfinal)}-release-#{platform}-#{version}.noarch.rpm")
     when 'deb'
       codename = Pkg::Platforms.codename_for_platform_version(platform, version)
-      return File.join(remote_repo_base(platform_tag, nonfinal), "#{repo_name(nonfinal)}-release-#{codename}.deb")
+      return File.join(remote_repo_base(platform_tag, nonfinal: nonfinal), "#{repo_name(nonfinal)}-release-#{codename}.deb")
     else
       warn "No release packages for package format '#{package_format}', skipping . . ."
       return nil

data/lib/packaging/util/ship.rb

@@ -106,22 +106,11 @@ 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, opts[:nonfinal])
   end
 
   def ship_debs(local_staging_directory, remote_path, opts = {})
     ship_pkgs(["#{local_staging_directory}/**/*.debian.tar.gz", "#{local_staging_directory}/**/*.orig.tar.gz" "#{local_staging_directory}/**/*.dsc", "#{local_staging_directory}/**/*.deb", "#{local_staging_directory}/**/*.changes"], Pkg::Config.apt_signing_server, remote_path, opts)
 
-    # We need to iterate through all the supported platforms here because of
-    # how deb repos are set up. Each codename will have its own link from the
-    # current versioned repo (e.g. puppet5) to the rolling repo. The one thing
-    # we don't care about is architecture, so we just grab the first supported
-    # 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, opts[:nonfinal])
-    end
   end
 
   def ship_svr4(local_staging_directory, remote_path, opts = {})
@@ -135,8 +124,6 @@ module Pkg::Util::Ship
   def ship_dmg(local_staging_directory, remote_path, opts = {})
     packages_have_shipped = 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, opts[:nonfinal])
-
     if packages_have_shipped
       Pkg::Platforms.platform_tags_for_package_format('dmg').each do |platform_tag|
         # Create the latest symlink for the current supported repo
@@ -147,14 +134,11 @@ 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, opts[:nonfinal])
   end
 
   def ship_msi(local_staging_directory, remote_path, opts = {})
     packages_have_shipped = 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, opts[:nonfinal])
     if packages_have_shipped
       # Create the symlinks for the latest supported repo
       Pkg::Util::Net.remote_create_latest_symlink(Pkg::Config.project, Pkg::Paths.artifacts_path(Pkg::Platforms.generic_platform_tag('windows'), remote_path, opts[:nonfinal]), 'msi', arch: 'x64')
@@ -205,7 +189,35 @@ module Pkg::Util::Ship
 
     Pkg::Util::Net.remote_ssh_cmd(staging_server, command) unless command.nil?
   rescue => e
-    fail "Failed to create rolling repo link for '#{platform_tag}'.\n#{e}"
+    fail "Failed to create rolling repo link for '#{platform_tag}'.\n#{e}\n#{e.backtrace}"
+  end
+
+  # create all of the rolling repo links in one step
+  def create_rolling_repo_links(nonfinal = false)
+    yum_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'rpm')
+    dmg_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'dmg')
+    swix_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'swix')
+    msi_path = Pkg::Paths.remote_repo_base(nonfinal: nonfinal, package_format: 'msi')
+
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('el'), Pkg::Config.yum_staging_server, yum_path, nonfinal)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('osx'), Pkg::Config.dmg_staging_server, dmg_path, nonfinal)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('eos'), Pkg::Config.swix_staging_server, swix_path, nonfinal)
+    create_rolling_repo_link(Pkg::Platforms.generic_platform_tag('windows'), Pkg::Config.msi_staging_server, msi_path, nonfinal)
+
+    # We need to iterate through all the supported platforms here because of
+    # how deb repos are set up. Each codename will have its own link from the
+    # current versioned repo (e.g. puppet5) to the rolling repo. The one thing
+    # we don't care about is architecture, so we just grab the first supported
+    # architecture for the code name we're working with at the moment. [written
+    # by Melissa, copied by Molly]
+
+    apt_path = Pkg::Config.apt_repo_staging_path
+    if nonfinal
+      apt_path = Pkg::Config.nonfinal_apt_repo_staging_path
+    end
+    Pkg::Platforms.codenames.each do |codename|
+      create_rolling_repo_link(Pkg::Platforms.codename_to_tags(codename)[0], Pkg::Config.apt_signing_server, apt_path, nonfinal)
+    end
   end
 
   def update_release_package_symlinks(local_staging_directory, nonfinal = false)
@@ -215,7 +227,7 @@ module Pkg::Util::Ship
       package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
       case package_format
       when 'rpm'
-        remote_base = Pkg::Paths.artifacts_path(platform_tag, Pkg::Paths.remote_repo_base(platform_tag, nonfinal), nonfinal)
+        remote_base = Pkg::Paths.artifacts_path(platform_tag, Pkg::Paths.remote_repo_base(platform_tag, nonfinal: nonfinal), nonfinal)
       when 'deb'
         remote_base = Pkg::Paths.apt_package_base_path(platform_tag, Pkg::Paths.repo_name(nonfinal), Pkg::Config.project, nonfinal)
       else

data/spec/lib/packaging/paths_spec.rb

@@ -213,6 +213,7 @@ describe 'Pkg::Paths' do
     before :each do
       allow(Pkg::Config).to receive(:yum_repo_path).and_return('foo')
       allow(Pkg::Config).to receive(:apt_repo_path).and_return('bar')
+      allow(Pkg::Config).to receive(:dmg_path).and_return('/opt/downloads/mac')
       allow(Pkg::Config).to receive(:nonfinal_yum_repo_path).and_return('foo-nightly')
       allow(Pkg::Config).to receive(:nonfinal_apt_repo_path).and_return('bar-nightly')
     end
@@ -223,13 +224,21 @@ describe 'Pkg::Paths' do
       expect(Pkg::Paths.remote_repo_base('ubuntu-18.04-amd64')).to eq('bar')
     end
     it 'returns nonfinal_yum_repo_path for nonfinal rpms' do
-      expect(Pkg::Paths.remote_repo_base('fedora-31-x86_64', true)).to eq('foo-nightly')
+      expect(Pkg::Paths.remote_repo_base('fedora-31-x86_64', nonfinal: true)).to eq('foo-nightly')
     end
     it 'returns nonfinal_apt_repo_path for nonfinal debs' do
-      expect(Pkg::Paths.remote_repo_base('debian-9-amd64', true)).to eq('bar-nightly')
+      expect(Pkg::Paths.remote_repo_base('debian-9-amd64', nonfinal: true)).to eq('bar-nightly')
     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('osx-10.14-x86_64') }.to raise_error(/Can't determine remote repo base path/)
+      expect { Pkg::Paths.remote_repo_base('solaris-11-i386') }.to raise_error(/Can't determine remote repo base path/)
     end
   end
 

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.65
+  version: 0.99.66
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec