packaging 0.121.0 → 0.122.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b15971001c7e8e8fe27231f8535680c4d2829a87064c53bb101ceeec0fa445c3
-  data.tar.gz: 44d4fa27eb2dce3f84e2d88248a0d16dd2842c26e55c6cc2a23dc25916e8c343
+  metadata.gz: a5560896502d75648fd074b547eff490dba3c818182bb0706fd7b655bdb5c41d
+  data.tar.gz: e5bda3251cbc2557d509e52b36a0a1ee5c60ef1b8c130034ce8b4e15d2f23fc2
 SHA512:
-  metadata.gz: 6f27e6ea8afb8289ee13b59f29c4693f644b6a00552be9b6cf291a4ce975397fd3a2f5fa275503bfd8598beb2572b8f47a9321fb19d4b1e4715a4b7d5b965a59
-  data.tar.gz: 1017d78d1cd65305b8619f748cdd76a6a05e776f042c5c5c62bd73c622689f0f7417c437d3460d968d0f7499509991f1e6bd64a7fb0b8bd187adaed63c2d1a61
+  metadata.gz: 8577e3d44d07aaf18e3524bb7df689ead02a05b367a0ddcfa7a776f10294bd4766ab3716d6b76c3de925b0b04561caccfa8d297476ce7cd4a8d8df85f158d9ab
+  data.tar.gz: adea75f16e3f172efab609ff830adbcd8aea67293b08804d28d5cc079dd2131c4f7507b3c777ab9f7742f35b834bfcb252fad924931811cd9a3123a7dd30df40

data/lib/packaging/artifactory.rb

@@ -62,7 +62,7 @@ module Pkg
       when 'deb'
         toplevel_repo = 'debian__local'
         repo_subdirectories = File.join(repo_subdirectories, "#{platform}-#{version}")
-      when 'swix', 'dmg', 'svr4', 'ips'
+      when 'dmg', 'svr4', 'ips'
         repo_subdirectories = File.join(repo_subdirectories, "#{platform}-#{version}-#{architecture}")
       when 'msi'
         repo_subdirectories = File.join(repo_subdirectories, "#{platform}-#{architecture}")

data/lib/packaging/config/params.rb

@@ -118,7 +118,6 @@ module Pkg::Params
                   nonfinal_repo_name
                   nonfinal_repo_link_target
                   nonfinal_svr4_path
-                  nonfinal_swix_path
                   nonfinal_yum_repo_path
                   notify
                   nuget_host
@@ -169,9 +168,6 @@ module Pkg::Params
                   summary
                   svr4_host
                   svr4_path
-                  swix_host
-                  swix_path
-                  swix_staging_server
                   tar_excludes
                   tar_host
                   tar_staging_server
@@ -260,7 +256,6 @@ module Pkg::Params
               { :var => :nonfinal_repo_link_target, :envvar => :NONFINAL_REPO_LINK_TARGET },
               { :var => :nonfinal_repo_name,      :envvar => :NONFINAL_REPO_NAME },
               { :var => :nonfinal_svr4_path,      :envvar => :NONFINAL_SVR4_PATH },
-              { :var => :nonfinal_swix_path,      :envvar => :NONFINAL_SWIX_PATH },
               { :var => :nonfinal_yum_repo_path,  :envvar => :NONFINAL_YUM_REPO_PATH },
               { :var => :notify,                  :envvar => :NOTIFY },
               { :var => :nuget_host,              :envvar => :NUGET_HOST },
@@ -288,11 +283,8 @@ module Pkg::Params
               { :var => :sign_tar,                :envvar => :SIGN_TAR,        :type => :bool },
               { :var => :signing_server,          :envvar => :SIGNING_SERVER },
               { :var => :staging_server,          :envvar => :STAGING_SERVER },
-              { :var => :swix_host,               :envvar => :SWIX_HOST },
-              { :var => :swix_staging_server,     :envvar => :SWIX_STAGING_SERVER },
               { :var => :svr4_host,               :envvar => :SVR4_HOST },
               { :var => :svr4_path,               :envvar => :SVR4_PATH },
-              { :var => :swix_path,               :envvar => :SWIX_PATH },
               { :var => :tar_host,                :envvar => :TAR_HOST },
               { :var => :tar_staging_server,      :envvar => :TAR_STAGING_SERVER },
               { :var => :team,                    :envvar => :TEAM },
@@ -343,7 +335,6 @@ module Pkg::Params
                     # These are fall-through values for shipping endpoints
                     { :oldvar => :staging_server,         :newvar => :apt_staging_server },
                     { :oldvar => :staging_server,         :newvar => :dmg_staging_server },
-                    { :oldvar => :staging_server,         :newvar => :swix_staging_server },
                     { :oldvar => :staging_server,         :newvar => :tar_staging_server },
                     { :oldvar => :staging_server,         :newvar => :yum_staging_server },
                     # These are fall-through values for signing/repo endpoints
@@ -356,7 +347,6 @@ module Pkg::Params
                     { :oldvar => :name,                   :newvar => :project },
                     { :oldvar => :pe_name,                :newvar => :project },
                     { :oldvar => :project,                :newvar => :gem_name },
-                    { :oldvar => :yum_host,               :newvar => :swix_host },
                     { :oldvar => :yum_host,               :newvar => :dmg_host },
                     { :oldvar => :yum_host,               :newvar => :tar_host },
                  ]
@@ -372,13 +362,4 @@ module Pkg::Params
                   { :var => :gpg_name, :message => "
     DEPRECATED, 29-Jul-2014: 'gpg_name' has been replaced with 'gpg_key'.
                    Please update this field in your build_defaults.yaml" }]
-
-  # Provide an open-ended template for validating BUILD_PARAMS.
-  #
-  # Each validatation contains the variable name as ':var' and a list of validations it
-  # must pass from the Pkg::Params::Validations class.
-  #
-  VALIDATIONS = [
-    { :var => :project, :validations => [:not_empty?] }
-  ]
 end

data/lib/packaging/config.rb

@@ -99,7 +99,7 @@ module Pkg
 
           # Remove the f-prefix from the fedora platform tag keys so that
           # beaker can rely on consistent keys once we rip out the f for good
-          tag = original_tag.sub(/fedora-f/, 'fedora-')
+          tag = original_tag.sub('fedora-f', 'fedora-')
 
           data[tag] ||= {}
 
@@ -140,7 +140,7 @@ module Pkg
               repo_config = "../repo_configs/rpm/pl-#{self.project}-" \
                             "#{self.ref}-#{original_tag}.repo"
             end
-          when 'swix', 'svr4', 'ips', 'dmg', 'msi'
+          when 'svr4', 'ips', 'dmg', 'msi'
             # No repo_configs for these platforms, so do nothing.
           else
             fail "Error: Unknown package format: '#{package_format}'. Maybe update PLATFORM_INFO?"
@@ -398,31 +398,6 @@ module Pkg
         end
       end
 
-      ##
-      #   Ask for validation of BUILD_PARAMS
-      #
-      #   Issued as warnings initially but the intent is to turn this into
-      #   a failure.
-      #
-      def perform_validations
-        error_count = 0
-        Pkg::Params::VALIDATIONS.each do |v|
-          variable_name = v[:var]
-          variable_value = self.instance_variable_get("@#{v[:var]}")
-          validations = v[:validations]
-          validations.each do |validation|
-            unless Pkg::ConfigValidations.send(validation, variable_value)
-              warn "Warning: variable \"#{variable_name}\" failed validation \"#{validation}\""
-              error_count += 1
-            end
-          end
-        end
-
-        if error_count != 0
-          warn "Warning: #{error_count} validation failure(s)."
-        end
-      end
-
       def string_to_array(str)
         delimiters = /[,\s;]/
         return str if str.respond_to?('each')

data/lib/packaging/deb.rb

@@ -15,7 +15,7 @@ module Pkg::Deb
       end
       if Pkg::Config.deb_build_mirrors
         ENV['BUILDMIRROR'] = Pkg::Config.deb_build_mirrors.map do |mirror|
-          mirror.gsub(/__DIST__/, dist)
+          mirror.gsub('__DIST__', dist)
         end.join(' | ')
       end
       ENV['DIST'] = dist

data/lib/packaging/paths.rb

@@ -128,8 +128,6 @@ module Pkg::Paths
       return File.join(prefix, platform_name, repo_name(is_nonfinal))
     when 'rpm'
       return File.join(prefix, yum_repo_name(is_nonfinal))
-    when 'swix'
-      return File.join(prefix, platform_name, repo_name(is_nonfinal))
     when 'svr4', 'ips'
       return File.join(prefix, 'solaris', repo_name(is_nonfinal))
     else
@@ -150,8 +148,6 @@ module Pkg::Paths
     case package_format
     when 'rpm'
       return File.join(prefix, link)
-    when 'swix'
-      return File.join(prefix, platform_name, link)
     when 'deb'
       debian_code_name = Pkg::Platforms.get_attribute(platform_tag, :codename)
       return File.join(prefix, debian_code_name, link)
@@ -195,8 +191,6 @@ module Pkg::Paths
     case package_format
     when 'rpm'
       File.join(base_path, platform, version, architecture)
-    when 'swix'
-      File.join(base_path, version, architecture)
     when 'deb'
       base_path
     when 'svr4', 'ips'
@@ -222,7 +216,7 @@ module Pkg::Paths
     package_format = Pkg::Platforms.package_format_for_tag(platform_tag)
 
     case package_format
-    when 'rpm', 'swix'
+    when 'rpm'
       if options[:legacy]
         File.join('repos', platform, version, repo_target, arch)
       else
@@ -263,7 +257,7 @@ module Pkg::Paths
     when 'deb'
       # deb/pl-puppet-agent-1.2.5-jessie.list
       File.join('repo_configs', 'deb', "*#{Pkg::Platforms.get_attribute(platform_tag, :codename)}*.list")
-    when 'msi', 'swix', 'dmg', 'svr4', 'ips'
+    when 'msi', 'dmg', 'svr4', 'ips'
       nil
     else
       raise "Not sure what to do with a package format of '#{package_format}'"
@@ -284,8 +278,6 @@ module Pkg::Paths
       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

data/lib/packaging/platforms.rb

@@ -172,7 +172,7 @@ module Pkg
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
-          signature_format: 'v3',
+          signature_format: 'v4',
           repo: true,
         },
         '8' => {
@@ -180,7 +180,7 @@ module Pkg
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
-          signature_format: 'v3',
+          signature_format: 'v4',
           repo: true,
         },
         '9' => {
@@ -280,6 +280,11 @@ module Pkg
           architectures: ['x64'],
           package_format: 'msi',
           repo: false,
+        },
+        '2016' => {
+          architectures: ['x64'],
+          package_format: 'msi',
+          repo: false,
         }
       },
     }

data/lib/packaging/sign/rpm.rb

@@ -65,7 +65,7 @@ module Pkg::Sign::Rpm
     %W[
       #{gpg_executable} --sign --detach-sign
       #{signing_version_flags(signing_version)}
-      #{passphrase_fd_flag}
+      #{passphrase_fd_flag} --verbose
       --batch --no-armor --no-secmem-warning
       --local-user %{_gpg_name}
       --output %{__signature_filename}
@@ -79,7 +79,7 @@ module Pkg::Sign::Rpm
     when :v3
       '--force-v3-sigs --digest-algo=sha1'
     when :v4
-      ''
+      '--digest-algo=sha512'
     else
       fail "Unrecognized signing_version: '#{signing_version}'"
     end

data/lib/packaging/util/file.rb

@@ -183,8 +183,6 @@ module Pkg::Util::File
       ensure
         FileUtils.rm_rf(build_data_directory)
       end
-
-      Pkg::Config.perform_validations
     end
 
     # The load_extras method is intended to load variables

data/lib/packaging/util/net.rb

@@ -184,7 +184,7 @@ module Pkg::Util::Net
         target_host: nil,
         extra_flags: nil,
         dryrun: ENV['DRYRUN']
-}.merge(opts.compact)
+}.merge(opts.merge(opts.delete_if { |_, value| value.nil? })) # rubocop:disable Style/CollectionCompact
 
       stdout, = Pkg::Util::Execution.capture3(rsync_cmd(source, options), true)
       stdout

data/lib/packaging/util/ship.rb

@@ -161,15 +161,6 @@ module Pkg::Util::Ship
     end
   end
 
-  def ship_swix(local_staging_directory, remote_path, opts = {})
-    ship_pkgs(
-      ["#{local_staging_directory}/**/*.swix"],
-      Pkg::Config.swix_staging_server,
-      remote_path,
-      opts
-    )
-  end
-
   def ship_msi(local_staging_directory, remote_path, opts = {})
     packages_have_shipped = ship_pkgs(
       ["#{local_staging_directory}/**/*.msi"],
@@ -241,7 +232,6 @@ module Pkg::Util::Ship
   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(
@@ -258,13 +248,6 @@ module Pkg::Util::Ship
       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,
@@ -338,14 +321,12 @@ module Pkg::Util::Ship
       MSI_HOST
       P5P_HOST
       SVR4_HOST
-      SWIX_HOST
       TAR_HOST
       YUM_HOST
       APT_SIGNING_SERVER
       APT_STAGING_SERVER
       DMG_STAGING_SERVER
       MSI_STAGING_SERVER
-      SWIX_STAGING_SERVER
       TAR_STAGING_SERVER
       YUM_STAGING_SERVER
       STAGING_SERVER

data/lib/packaging/util/sign.rb

@@ -25,7 +25,6 @@ module Pkg::Util::Sign
       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
-      sign_tasks    << "pl:sign_swix" if Pkg::Config.vanagon_project
       sign_tasks    << "pl:sign_svr4" if Pkg::Config.vanagon_project
       sign_tasks    << "pl:sign_ips" if Pkg::Config.vanagon_project
       sign_tasks    << "pl:sign_msi" if Pkg::Config.build_msi || Pkg::Config.vanagon_project

data/lib/packaging/util/version.rb

@@ -84,7 +84,7 @@ module Pkg::Util::Version
       return "#{dot_version(version)}-#{Pkg::Config.release}".split('-') if final?(version) || Pkg::Config.vanagon_project
 
       if version.include?('SNAPSHOT')
-        new_version = dot_version(version).sub(/\.SNAPSHOT/, "-0.#{Pkg::Config.release}SNAPSHOT")
+        new_version = dot_version(version).sub('.SNAPSHOT', "-0.#{Pkg::Config.release}SNAPSHOT")
       elsif version.include?('rc')
         rc_ver = dot_version(version).match(/\.?rc(\d+)/)[1]
         new_version = dot_version(version).sub(/\.?rc(\d+)/, '') + "-0.#{Pkg::Config.release}rc#{rc_ver}"

data/spec/lib/packaging/config_spec.rb

@@ -91,7 +91,6 @@ CONFIGURATION_KEYS = %i[
   nonfinal_repo_name
   nonfinal_repo_link_target
   nonfinal_svr4_path
-  nonfinal_swix_path
   nonfinal_yum_repo_path
   notify
   project
@@ -122,7 +121,6 @@ CONFIGURATION_KEYS = %i[
   summary
   svr4_host
   svr4_path
-  swix_path
   tar_excludes
   tar_host
   tarball_path

data/spec/lib/packaging/sign_spec.rb

@@ -61,13 +61,10 @@ describe 'Pkg::Sign' do
       let(:rpms_not_to_sign) do
         %W[#{rpm_directory}/aix/7.1/PC1/ppc/puppet-agent-5.5.3-1.aix7.1.ppc.rpm]
       end
-      let(:v3_rpms) do
-        %W[#{rpm_directory}/redhatfips/7/PC1/x86_64/puppet-agent-5.5.3-1.redhatfips7.x86_64.rpm]
-      end
       let(:v4_rpms) do
         %W[%#{rpm_directory}/el/7/PC1/aarch64/puppet-agent-5.5.3-1.el7.aarch64.rpm]
       end
-      let(:rpms) { rpms_not_to_sign + v3_rpms + v4_rpms }
+      let(:rpms) { rpms_not_to_sign + v4_rpms }
       let(:already_signed_rpms) do
         %W[#{rpm_directory}/el/6/PC1/x86_64/puppet-agent-5.5.3-1.el6.x86_64.rpm]
       end
@@ -81,12 +78,11 @@ describe 'Pkg::Sign' do
           #{rpm_directory}/sles/12/puppet5/x86_64/puppetserver-5.3.3-1.sles12.noarch.rpm
         ]
       end
-      it 'signs both v3 and v4 rpms' do
+      it 'signs v4 rpms' do
         allow(Dir).to receive(:[]).with("#{rpm_directory}/**/*.rpm").and_return(rpms)
         rpms.each do |rpm|
           allow(Pkg::Sign::Rpm).to receive(:signed?).and_return(false)
         end
-        expect(Pkg::Sign::Rpm).to receive(:sign).with(v3_rpms.join(' '), :v3)
         expect(Pkg::Sign::Rpm).to receive(:sign).with(v4_rpms.join(' '), :v4)
         Pkg::Sign::Rpm.sign_all(rpm_directory)
       end

data/tasks/config.rake

@@ -6,11 +6,6 @@ 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/fetch.rake

@@ -55,7 +55,5 @@ namespace :pl do
     ensure
       rm_rf build_data_directory
     end
-
-    Pkg::Util::RakeUtils.invoke_task('config:validate')
   end
 end

data/tasks/jenkins.rake

@@ -256,7 +256,6 @@ namespace :pl do
         ship_rpms
         ship_debs
         ship_dmg
-        ship_swix
         ship_tar
         ship_msi
         ship_gem
@@ -285,7 +284,6 @@ namespace :pl do
         ship_nightly_rpms
         ship_nightly_debs
         ship_nightly_dmg
-        ship_nightly_swix
         ship_nightly_msi
       ]
       tasks.map { |t| "pl:#{t}" }.each do |t|
@@ -339,7 +337,6 @@ namespace :pl do
         remote:deploy_apt_repo
         remote:deploy_yum_repo
         remote:deploy_dmg_repo
-        remote:deploy_swix_repo
         remote:deploy_msi_repo
         remote:deploy_tar_repo
         remote:deploy_apt_repo_to_s3
@@ -356,14 +353,12 @@ namespace :pl do
       uber_tasks.delete("remote:deploy_apt_repo") if Pkg::Config.apt_host == Pkg::Config.apt_signing_server
       uber_tasks.delete("remote:deploy_yum_repo") if Pkg::Config.yum_host == Pkg::Config.yum_staging_server
       uber_tasks.delete("remote:deploy_dmg_repo") if Pkg::Config.dmg_host == Pkg::Config.dmg_staging_server
-      uber_tasks.delete("remote:deploy_swix_repo") if Pkg::Config.swix_host == Pkg::Config.swix_staging_server
       uber_tasks.delete("remote:deploy_tar_repo") if Pkg::Config.tar_host == Pkg::Config.tar_staging_server
 
       if Pkg::Config.s3_ship
         uber_tasks.delete("remote:deploy_apt_repo")
         uber_tasks.delete("remote:deploy_yum_repo")
         uber_tasks.delete("remote:deploy_dmg_repo")
-        uber_tasks.delete("remote:deploy_swix_repo")
         uber_tasks.delete("remote:deploy_msi_repo")
         uber_tasks.delete("remote:deploy_tar_repo")
       else
@@ -409,10 +404,6 @@ namespace :pl do
         uber_tasks.delete("remote:deploy_dmg_repo")
       end
 
-      if Dir.glob("pkg/**/*.swix").empty?
-        uber_tasks.delete("remote:deploy_swix_repo")
-      end
-
       if Dir.glob("pkg/**/*.msi").empty?
         uber_tasks.delete("remote:deploy_msi_repo")
       end

data/tasks/ship.rake

@@ -172,17 +172,6 @@ namespace :pl do
       end
     end
 
-    desc "Move swix repos from #{Pkg::Config.swix_staging_server} to #{Pkg::Config.swix_host}"
-    task deploy_swix_repo: 'pl:fetch' do
-      puts "Really run remote rsync to deploy Arista repos from #{Pkg::Config.swix_staging_server} to #{Pkg::Config.swix_host}? [y,n]"
-      if Pkg::Util.ask_yes_or_no
-        Pkg::Util::Execution.retry_on_fail(times: 3) do
-          cmd = Pkg::Util::Net.rsync_cmd(Pkg::Config.swix_path, target_host: Pkg::Config.swix_host, extra_flags: ['--update'])
-          Pkg::Util::Net.remote_execute(Pkg::Config.swix_staging_server, cmd)
-        end
-      end
-    end
-
     desc "Move tar repos from #{Pkg::Config.tar_staging_server} to #{Pkg::Config.tar_host}"
     task deploy_tar_repo: 'pl:fetch' do
       puts "Really run remote rsync to deploy source tarballs from #{Pkg::Config.tar_staging_server} to #{Pkg::Config.tar_host}? [y,n]"
@@ -249,7 +238,7 @@ namespace :pl do
 
     ##
     ## S3 syncing
-    S3_REPO_SYNC = 'sudo /usr/local/bin/s3_repo_sync.sh'
+    S3_REPO_SYNC = 'sudo /usr/local/bin/s3_repo_sync'
 
     desc "Sync signed apt repos from #{Pkg::Config.apt_signing_server} to S3"
     task :deploy_apt_repo_to_s3 => 'pl:fetch' do
@@ -462,18 +451,6 @@ namespace :pl do
     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
-    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
-    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}"
   task ship_tar: 'pl:fetch' do
     if Pkg::Config.build_tar
@@ -518,7 +495,6 @@ namespace :pl do
     Rake::Task['pl:ship_rpms'].invoke
     Rake::Task['pl:ship_debs'].invoke
     Rake::Task['pl:ship_dmg'].invoke
-    Rake::Task['pl:ship_swix'].invoke
     Rake::Task['pl:ship_nuget'].invoke
     Rake::Task['pl:ship_tar'].invoke
     Rake::Task['pl:ship_svr4'].invoke

data/tasks/sign.rake

@@ -13,18 +13,6 @@ namespace :pl do
   # 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, :root_dir do |_t, args|
-    swix_dir = args.root_dir || $DEFAULT_DIRECTORY
-    packages = Dir["#{swix_dir}/**/*.swix"]
-    next if packages.empty?
-
-    Pkg::Util::Gpg.load_keychain if Pkg::Util::Tool.find_tool('keychain')
-    packages.each do |swix_package|
-      Pkg::Util::Gpg.sign_file swix_package
-    end
-  end
-
   desc "Detach sign any solaris svr4 packages"
   task :sign_svr4, :root_dir do |_t, args|
     svr4_dir = args.root_dir || $DEFAULT_DIRECTORY
@@ -137,7 +125,6 @@ namespace :pl do
       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
-      sign_tasks    << "pl:sign_swix" if Pkg::Config.vanagon_project
       sign_tasks    << "pl:sign_svr4" if Pkg::Config.vanagon_project
       sign_tasks    << "pl:sign_ips" if Pkg::Config.vanagon_project
       sign_tasks    << "pl:sign_msi" if Pkg::Config.build_msi || Pkg::Config.vanagon_project

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.121.0
+  version: 0.122.0
 platform: ruby
 authors:
 - Puppet By Perforce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debug
@@ -136,6 +136,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -307,28 +327,28 @@ signing_key:
 specification_version: 4
 summary: Puppet by Perforce packaging automation
 test_files:
-- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
 - spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/deb_spec.rb
 - spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/util/gpg_spec.rb
-- spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/file_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/ship_spec.rb
 - spec/lib/packaging/util/git_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/gpg_spec.rb
+- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/jenkins_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
+- spec/lib/packaging/util/file_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
 - spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/paths_spec.rb
 - spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/gem_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/deb_spec.rb
 - spec/lib/packaging_spec.rb