packaging 0.104.0 → 0.105.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0489f147bdc92caf1f1047d3a0cfac453b125222e18dc9547b78c9aeb1e69122'
-  data.tar.gz: 298a35804a42f8eaaccaf1d740b0cb50ed3bc19a53aeb4c1b5689ec00a7bc747
+  metadata.gz: 296bfdcecf936f80297894792d9b9a1bb3a83a422a61e4976aca3916dd6c9a2b
+  data.tar.gz: 0c76c4482d82367cef9d988fc1e31080f718322e4eab1fe9a5176f4544c8a3ce
 SHA512:
-  metadata.gz: a331668242a0d7c1ce4eb1190bdb5cf6decc557a4082e6ce833298e39bfb4b3da82ee78e6e7a8d6e4b429fcfab8cc34e051d7183a552dc985f90ff38bb200ad6
-  data.tar.gz: '084c6c13bec16b7714d16861e906e030f3abd0c6a576545a984cfaf72b9791bf4935f21d13d4817d652d755d91f1c65a292a30e4ff6d7af0296f5760a44fe9a8'
+  metadata.gz: 071534bcce41eb8b11517d21592399a9f94c45b20a70259aa5a13c4bf3ec5bfd6cab5e517698e6f8884736a932a62d0212d945cb97ad549bdf8c80242f594f8e
+  data.tar.gz: 532cca35cd6eeea218c8a6cdcdf00f0802f0c0ae33fc009f6f42bd7c39056f45b147abaf971879e2f5532541e1d08c0c6267425d32aa69dad9c11f036697c183

data/lib/packaging/platforms.rb

@@ -22,14 +22,6 @@ module Pkg
       },
 
       'debian' => {
-        '8' => {
-          codename: 'jessie',
-          architectures: ['amd64', 'i386', 'powerpc'],
-          source_architecture: 'source',
-          package_format: 'deb',
-          source_package_formats: DEBIAN_SOURCE_FORMATS,
-          repo: true,
-        },
         '9' => {
           codename: 'stretch',
           architectures: ['amd64', 'i386'],
@@ -57,14 +49,6 @@ module Pkg
       },
 
       'el' => {
-        '5' => {
-          architectures: ['x86_64', 'i386'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v3',
-          repo: true,
-        },
         '6' => {
           architectures: ['x86_64', 'i386'],
           source_architecture: 'SRPMS',
@@ -88,26 +72,18 @@ module Pkg
           source_package_formats: ['src.rpm'],
           signature_format: 'v4',
           repo: true,
-        }
-      },
-
-      'fedora' => {
-        '30' => {
-          architectures: ['x86_64'],
-          source_architecture: 'SRPMS',
-          package_format: 'rpm',
-          source_package_formats: ['src.rpm'],
-          signature_format: 'v4',
-          repo: true,
         },
-        '31' => {
+        '9' => {
           architectures: ['x86_64'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],
           signature_format: 'v4',
           repo: true,
-        },
+        }
+      },
+
+      'fedora' => {
         '32' => {
           architectures: ['x86_64'],
           source_architecture: 'SRPMS',
@@ -127,16 +103,6 @@ module Pkg
       },
 
       'osx' => {
-        '10.13' => {
-          architectures: ['x86_64'],
-          package_format: 'dmg',
-          repo: false,
-        },
-        '10.14' => {
-          architectures: ['x86_64'],
-          package_format: 'dmg',
-          repo: false,
-        },
         '10.15' => {
           architectures: ['x86_64'],
           package_format: 'dmg',
@@ -233,14 +199,6 @@ module Pkg
           source_package_formats: DEBIAN_SOURCE_FORMATS,
           repo: true,
         },
-        '18.10' => {
-          codename: 'cosmic',
-          architectures: ['amd64', 'ppc64el'],
-          source_architecture: 'source',
-          package_format: 'deb',
-          source_package_formats: DEBIAN_SOURCE_FORMATS,
-          repo: true,
-        },
         '20.04' => {
           codename: 'focal',
           architectures: ['amd64', 'aarch64'],

data/lib/packaging/util/file.rb

@@ -120,6 +120,85 @@ module Pkg::Util::File
       end
       Pkg::Util::Version.versionbump(workdir) if Pkg::Config.update_version_file
     end
+
+    # The fetch method pulls down two files from the build-data repo that contain additional
+    # data specific to Puppet Labs release infrastructure intended to augment/override any
+    # defaults specified in the source project repo, e.g. in ext/build_defaults.yaml
+    #
+    # It uses curl to download the files, and places them in a temporary
+    # directory, e.g. /tmp/somedirectory/{project,team}/Pkg::Config.builder_data_file
+    #
+    # Retrieve build-data configurations to override/extend local build_defaults
+    def fetch
+      # Each team has a build-defaults file that specifies local infrastructure targets
+      # for things like builders, target locations for build artifacts, etc Since much
+      # of these don't change, one file can be maintained for the team.  Each project
+      # also has a data file for information specific to it. If the project builds
+      # both PE and not PE, it has two files, one for PE, and the other for FOSS
+      #
+      data_repo = Pkg::Config.build_data_repo
+
+      if Pkg::Config.dev_build
+        puts "NOTICE: This is a dev build!"
+        project_data_branch = "#{Pkg::Config.project}-dev"
+      else
+        project_data_branch = Pkg::Config.project
+      end
+      team_data_branch = Pkg::Config.team
+
+      if Pkg::Config.build_pe
+        project_data_branch = 'pe-' + project_data_branch unless project_data_branch =~ /^pe-/
+        team_data_branch = 'pe-' + team_data_branch unless team_data_branch =~ /^pe-/
+      end
+
+      # Remove .packaging directory from old-style extras loading
+      FileUtils.rm_rf("#{ENV['HOME']}/.packaging") if File.directory?("#{ENV['HOME']}/.packaging")
+
+      # Touch the .packaging file which is allows packaging to present remote tasks
+      FileUtils.touch("#{ENV['HOME']}/.packaging")
+
+      begin
+        build_data_directory = Pkg::Util::File.mktemp
+        %x(git clone #{data_repo} #{build_data_directory})
+        unless $?.success?
+          fail 'Error: could not fetch the build-data repo. Maybe you do not have the correct permissions?'
+        end
+
+        Dir.chdir(build_data_directory) do
+          [team_data_branch, project_data_branch].each do |branch|
+            %x(git checkout #{branch})
+            unless $?.success?
+              warn "Warning: no build_defaults found in branch '#{branch}' of '#{data_repo}'. Skipping."
+              next
+            end
+            load_extras(build_data_directory)
+          end
+        end
+      ensure
+        FileUtils.rm_rf(build_data_directory)
+      end
+
+      Pkg::Config.perform_validations
+    end
+
+    # The load_extras method is intended to load variables
+    # from the extra yaml file downloaded by the pl:fetch task.
+    # The goal is to be able to augment/override settings in the
+    # source project's build_data.yaml and project_data.yaml with
+    # Puppet Labs-specific data, rather than having to clutter the
+    # generic tasks with data not generally useful outside the
+    # PL Release team
+    def load_extras(temp_directory)
+      unless ENV['PARAMS_FILE'] && ENV['PARAMS_FILE'] != ''
+        temp_directory = temp_directory
+        raise "load_extras requires a directory containing extras data" if temp_directory.nil?
+        Pkg::Config.config_from_yaml("#{temp_directory}/#{Pkg::Config.builder_data_file}")
+
+        # Environment variables take precedence over those loaded from configs,
+        # so we make sure that any we clobbered are reset.
+        Pkg::Config.load_envvars
+      end
+    end
   end
 end
 

data/lib/packaging/util/net.rb

@@ -392,9 +392,8 @@ DOC
     end
 
     def remote_bundle_install_command
-      export_packaging_location = ''
       export_packaging_location = "export PACKAGING_LOCATION='#{ENV['PACKAGING_LOCATION']}';" if ENV['PACKAGING_LOCATION'] && !ENV['PACKAGING_LOCATION'].empty?
-      command = "source /usr/local/rvm/scripts/rvm; rvm use ruby-2.5.1; #{export_packaging_location} bundle install --path .bundle/gems ;"
+      "source /usr/local/rvm/scripts/rvm; rvm use ruby-2.5.1; #{export_packaging_location} bundle install --path .bundle/gems ;"
     end
 
     # Given a BuildInstance object and a host, send its params to the host. Return

data/lib/packaging/util/repo.rb

@@ -0,0 +1,18 @@
+# Module for signing all packages to places
+
+module Pkg::Util::Repo
+  class << self
+
+    # Create yum repositories of built RPM packages for this SHA on the distribution server
+    def rpm_repos
+      Pkg::Util::File.fetch
+      Pkg::Rpm::Repo.create_remote_repos
+    end
+
+    # Create apt repositories of build DEB packages for this SHA on the distributions server
+    def deb_repos
+      Pkg::Util::File.fetch
+      Pkg::Deb::Repo.create_repos
+    end
+  end
+end

data/lib/packaging/util/ship.rb

@@ -355,4 +355,151 @@ module Pkg::Util::Ship
     end
     Rake::Task[ship_task].invoke
   end
+
+  # Ship pkg directory contents to distribution server
+  def ship(target = 'artifacts', local_directory = 'pkg')
+    Pkg::Util::File.fetch
+
+    unless Pkg::Config.project
+      fail "You must set the 'project' in build_defaults.yaml or with the 'PROJECT_OVERRIDE' environment variable."
+    end
+
+    project_basedir = "#{Pkg::Config.jenkins_repo_path}/#{Pkg::Config.project}/#{Pkg::Config.ref}"
+    artifact_directory = "#{project_basedir}/#{target}"
+
+    # For EZBake builds, we also want to include the ezbake.manifest file to
+    # get a snapshot of this build and all dependencies. We eventually will
+    # create a yaml version of this file, but until that point we want to
+    # make the original ezbake.manifest available
+    #
+    ezbake_manifest = File.join('ext', 'ezbake.manifest')
+    if File.exist?(ezbake_manifest)
+      FileUtils.cp(ezbake_manifest, File.join(local_directory, "#{Pkg::Config.ref}.ezbake.manifest"))
+    end
+    ezbake_yaml = File.join("ext", "ezbake.manifest.yaml")
+    if File.exists?(ezbake_yaml)
+      FileUtils.cp(ezbake_yaml, File.join(local_directory, "#{Pkg::Config.ref}.ezbake.manifest.yaml"))
+    end
+
+    # Inside build_metadata*.json files there is additional metadata containing
+    # information such as git ref and dependencies that are needed at build
+    # time. If these files exist, copy them downstream.
+    # Typically these files are named 'ext/build_metadata.<project>.<platform>.json'
+    build_metadata_json_files = Dir.glob('ext/build_metadata*.json')
+    build_metadata_json_files.each do |source_file|
+      target_file = File.join(local_directory, "#{Pkg::Config.ref}.#{File.basename(source_file)}")
+      FileUtils.cp(source_file, target_file)
+    end
+
+    # Sadly, the packaging repo cannot yet act on its own, without living
+    # inside of a packaging-repo compatible project. This means in order to
+    # use the packaging repo for shipping and signing (things that really
+    # don't require build automation, specifically) we still need the project
+    # clone itself.
+    Pkg::Util::Git.bundle('HEAD', 'signing_bundle', local_directory)
+
+    # While we're bundling things, let's also make a git bundle of the
+    # packaging repo that we're using when we invoke pl:jenkins:ship. We can
+    # have a reasonable level of confidence, later on, that the git bundle on
+    # the distribution server was, in fact, the git bundle used to create the
+    # associated packages. This is because this ship task is automatically
+    # called upon completion each cell of the pl:jenkins:uber_build, and we
+    # have --ignore-existing set below. As such, the only git bundle that
+    # should possibly be on the distribution is the one used to create the
+    # packages.
+    # We're bundling the packaging repo because it allows us to keep an
+    # archive of the packaging source that was used to create the packages,
+    # so that later on if we need to rebuild an older package to audit it or
+    # for some other reason we're assured that the new package isn't
+    # different by virtue of the packaging automation.
+    if defined?(PACKAGING_ROOT)
+      packaging_bundle = ''
+      Dir.chdir(PACKAGING_ROOT) do
+        packaging_bundle = Pkg::Util::Git.bundle('HEAD', 'packaging-bundle')
+      end
+      FileUtils.mv(packaging_bundle, local_directory)
+    end
+
+    # This is functionality to add the project-arch.msi links that have no
+    # version. The code itself looks for the link (if it's there already)
+    # and if the source package exists before linking. Searching for the
+    # packages has been restricted specifically to just the pkg/windows dir
+    # on purpose, as this is where we currently have all windows packages
+    # building to. Once we move the Metadata about the output location in
+    # to one source of truth we can refactor this to use that to search
+    #                                           -Sean P. M. 08/12/16
+
+    {
+      'windows' => ['x86', 'x64'],
+      'windowsfips' => ['x64']
+    }.each_pair do |platform, archs|
+      packages = Dir["#{local_directory}/#{platform}/*"]
+
+      archs.each do |arch|
+        package_version = Pkg::Util::Git.describe.tr('-', '.')
+        package_filename = File.join(local_directory, platform, "#{Pkg::Config.project}-#{package_version}-#{arch}.msi")
+        link_filename = File.join(local_directory, platform, "#{Pkg::Config.project}-#{arch}.msi")
+
+        next unless !packages.include?(link_filename) && packages.include?(package_filename)
+        # Dear future code spelunkers:
+        # Using symlinks instead of hard links causes failures when we try
+        # to set these files to be immutable. Also be wary of whether the
+        # linking utility you're using expects the source path to be relative
+        # to the link target or pwd.
+        #
+        FileUtils.ln(package_filename, link_filename)
+      end
+    end
+
+    Pkg::Util::Execution.retry_on_fail(times: 3) do
+      Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir --mode=775 -p #{project_basedir}")
+      Pkg::Util::Net.remote_execute(Pkg::Config.distribution_server, "mkdir -p #{artifact_directory}")
+      Pkg::Util::Net.rsync_to("#{local_directory}/", Pkg::Config.distribution_server, "#{artifact_directory}/", extra_flags: ['--ignore-existing', '--exclude repo_configs'])
+    end
+
+    # In order to get a snapshot of what this build looked like at the time
+    # of shipping, we also generate and ship the params file
+    #
+    Pkg::Config.config_to_yaml(local_directory)
+    Pkg::Util::Execution.retry_on_fail(:times => 3) do
+      Pkg::Util::Net.rsync_to("#{local_directory}/#{Pkg::Config.ref}.yaml", Pkg::Config.distribution_server, "#{artifact_directory}/", extra_flags: ["--exclude repo_configs"])
+    end
+
+    # If we just shipped a tagged version, we want to make it immutable
+    files = Dir.glob("#{local_directory}/**/*").select { |f| File.file?(f) and !f.include? "#{Pkg::Config.ref}.yaml" }.map do |file|
+      "#{artifact_directory}/#{file.sub(/^#{local_directory}\//, '')}"
+    end
+
+    Pkg::Util::Net.remote_set_ownership(Pkg::Config.distribution_server, 'root', 'release', files)
+    Pkg::Util::Net.remote_set_permissions(Pkg::Config.distribution_server, '0664', files)
+    Pkg::Util::Net.remote_set_immutable(Pkg::Config.distribution_server, files)
+  end
+
+  def ship_to_artifactory(local_directory = 'pkg')
+    Pkg::Util::File.fetch
+    unless Pkg::Config.project
+      fail "You must set the 'project' in build_defaults.yaml or with the 'PROJECT_OVERRIDE' environment variable."
+    end
+    artifactory = Pkg::ManageArtifactory.new(Pkg::Config.project, Pkg::Config.ref)
+
+    artifacts = Dir.glob("#{local_directory}/**/*").reject { |e| File.directory? e }
+    artifacts.sort! do |a, b|
+      if File.extname(a) =~ /(md5|sha\d+)/ && File.extname(b) !~ /(md5|sha\d+)/
+        1
+      elsif File.extname(b) =~ /(md5|sha\d+)/ && File.extname(a) !~ /(md5|sha\d+)/
+        -1
+      else
+        a <=> b
+      end
+    end
+    artifacts.each do |artifact|
+      if File.extname(artifact) == ".yaml" || File.extname(artifact) == ".json"
+        artifactory.deploy_package(artifact)
+      elsif artifactory.package_exists_on_artifactory?(artifact)
+        warn "Attempt to upload '#{artifact}' failed. Package already exists!"
+      else
+        artifactory.deploy_package(artifact)
+      end
+    end
+  end
 end

data/lib/packaging/util/sign.rb

@@ -0,0 +1,47 @@
+# Module for signing all packages to places
+
+
+module Pkg::Util::Sign
+  class << self
+    # Sign all locally staged packages on signing server.
+    def sign_all(root_directory = nil)
+      Pkg::Util::File.fetch
+      root_directory ||= ENV['DEFAULT_DIRECTORY']
+      Dir["#{root_directory}/*"].empty? and fail "There were no files found in #{root_directory}. \
+      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
+      # extra :jenkins task for signing PE, we determine which sign task to use
+      # based on if we're building PE.
+      # We also listen in on the environment variable SIGNING_BUNDLE. This is
+      # _NOT_ intended for public use, but rather with the internal promotion
+      # workflow for Puppet Enterprise. SIGNING_BUNDLE is the path to a tarball
+      # containing a git bundle to be used as the environment for the packaging
+      # repo in a signing operation.
+      signing_bundle = ENV['SIGNING_BUNDLE']
+      sign_tasks    = ["pl:sign_rpms"]
+      sign_tasks    << "pl:sign_deb_changes" unless Dir["#{root_directory}/**/*.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
+      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
+      remote_repo   = Pkg::Util::Net.remote_unpack_git_bundle(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(root_directory, Pkg::Config.signing_server, remote_repo)
+      rake_command = <<-DOC
+cd #{remote_repo} ;
+#{Pkg::Util::Net.remote_bundle_install_command}
+bundle exec rake #{sign_tasks.map { |task| task + "[#{root_directory}]" }.join(" ")} PARAMS_FILE=#{build_params}
+DOC
+      Pkg::Util::Net.remote_execute(Pkg::Config.signing_server, rake_command)
+      Pkg::Util::Net.rsync_from("#{remote_repo}/#{root_directory}/", Pkg::Config.signing_server, "#{root_directory}/")
+      Pkg::Util::Net.remote_execute(Pkg::Config.signing_server, "rm -rf #{remote_repo}")
+      Pkg::Util::Net.remote_execute(Pkg::Config.signing_server, "rm #{build_params}")
+      puts "Signed packages staged in #{root_directory}/ directory"
+    end
+  end
+end

data/lib/packaging/util.rb

@@ -25,6 +25,8 @@ module Pkg::Util
   require 'packaging/util/version'
   require 'packaging/util/windows'
   require 'packaging/util/git_tags'
+  require 'packaging/util/sign'
+  require 'packaging/util/repo'
 
   def self.boolean_value(var)
     return true if var == true || ( var.is_a?(String) && ( var.downcase == 'true' || var.downcase =~ /^y$|^yes$/))

data/spec/lib/packaging/config_spec.rb

@@ -223,7 +223,7 @@ describe "Pkg::Config" do
       "./artifacts/aix/7.1/PC1/ppc/puppet-agent-5.3.2-1.aix7.1.ppc.rpm"
 
     fedora_artifacts = \
-      "./artifacts/fedora/31/PC1/x86_64/puppet-agent-5.3.2-1.fc31.x86_64.rpm"
+      "./artifacts/fedora/32/PC1/x86_64/puppet-agent-5.3.2-1.fc32.x86_64.rpm"
 
     windows_artifacts = \
       "./artifacts/windows/puppet-agent-x64.msi\n" \
@@ -280,8 +280,8 @@ describe "Pkg::Config" do
     it "should not use 'f' in fedora platform tags" do
       allow(Pkg::Util::Net).to receive(:remote_execute).and_return(fedora_artifacts, nil)
       data = Pkg::Config.platform_data
-      expect(data).to include('fedora-31-x86_64')
-      expect(data).not_to include('fedora-f31-x86_64')
+      expect(data).to include('fedora-32-x86_64')
+      expect(data).not_to include('fedora-f32-x86_64')
     end
 
     it "should collect packages whose extname differ from package_format" do

data/spec/lib/packaging/deb/repo_spec.rb

@@ -6,7 +6,7 @@ describe "Pkg::Deb::Repo" do
   let(:project)       { "deb_repos" }
   let(:ref)           { "1234abcd" }
   let(:base_url)      { "http://#{builds_server}/#{project}/#{ref}" }
-  let(:cows)          { ["xenial", "jessie", "trusty", "stretch", ""] }
+  let(:cows)          { ["xenial", "trusty", "stretch", ""] }
   let(:wget_results)  { cows.map {|cow| "#{base_url}/repos/apt/#{cow}" }.join("\n") }
   let(:wget_garbage)  { "\n and an index\nhttp://somethingelse.com/robots" }
   let(:repo_configs)  { cows.reject {|cow| cow.empty?}.map {|dist| "pkg/repo_configs/deb/pl-#{project}-#{ref}-#{dist}.list" } }

data/spec/lib/packaging/paths_spec.rb

@@ -5,12 +5,11 @@ describe 'Pkg::Paths' 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',
+      ['artifacts/fedora/32/puppet6/x86_64/puppet-agent-6.9.0-1.fc32.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/ubuntu-16.04-i386/puppetserver_5.0.1-0.1SNAPSHOT.2017.07.27T2346puppetlabs1.debian.tar.gz', 'ubuntu', '16.04'] => 'source',
-      ['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|
@@ -273,7 +272,7 @@ describe 'Pkg::Paths' do
         .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))
+      expect(Pkg::Paths.remote_repo_base('fedora-34-x86_64', nonfinal: true))
         .to eq(fake_yum_nightly_repo_path)
     end
     it 'returns nonfinal_apt_repo_path for nonfinal debs' do

data/spec/lib/packaging/platforms_spec.rb

@@ -26,7 +26,7 @@ describe 'Pkg::Platforms' do
 
   describe '#versions_for_platform' do
     it 'should return all supported versions for a given platform' do
-      expect(Pkg::Platforms.versions_for_platform('el')).to match_array(['5', '6', '7', '8'])
+      expect(Pkg::Platforms.versions_for_platform('el')).to match_array(['6', '7', '8', '9'])
     end
 
     it 'should raise an error if given a nonexistent platform' do
@@ -36,7 +36,7 @@ describe 'Pkg::Platforms' do
 
   describe '#codenames' do
     it 'should return all codenames for a given platform' do
-      codenames = ['focal', 'bionic', 'bullseye', 'buster', 'cosmic', 'jessie', 'stretch', 'trusty', 'xenial']
+      codenames = ['focal', 'bionic', 'bullseye', 'buster', 'stretch', 'trusty', 'xenial']
       expect(Pkg::Platforms.codenames).to match_array(codenames)
     end
   end
@@ -101,12 +101,12 @@ describe 'Pkg::Platforms' do
       it 'should return a hash of platform info' do
         expect(Pkg::Platforms.platform_lookup(platform)).to be_instance_of(Hash)
       end
-  
+
       it 'should include at least arch and package format keys' do
         expect(Pkg::Platforms.platform_lookup(platform).keys).to include(:architectures)
         expect(Pkg::Platforms.platform_lookup(platform).keys).to include(:package_format)
       end
-    end 
+    end
   end
 
   describe '#get_attribute' do
@@ -166,7 +166,7 @@ describe 'Pkg::Platforms' do
 
   describe '#generic_platform_tag' do
     it 'fails for unsupported platforms' do
-      expect { Pkg::Platforms.generic_platform_tag('butts') }.to raise_error
+      expect { Pkg::Platforms.generic_platform_tag('noplatform') }.to raise_error
     end
 
     it 'returns a supported platform tag containing the supplied platform' do

data/spec/lib/packaging/sign_spec.rb

@@ -15,13 +15,6 @@ Header V4 RSA/SHA256 Signature, key ID ef8d349f: NOKEY
 Header SHA1 digest: OK (3cb7e9861e8bc09783a1b6c8d88243a3c16daa81)
 V4 RSA/SHA256 Signature, key ID ef8d349f: NOKEY
 MD5 digest: OK (d5f06ba2a9053de532326d0659ec0d11)
-DOC
-      }
-      let(:el5_signed_response) { <<-DOC
-Header V3 RSA/SHA1 signature: NOKEY, key ID ef8d349f
-Header SHA1 digest: OK (12ea7bd578097a3aecc5deb8ada6aca6147d68e3)
-V3 RSA/SHA1 signature: NOKEY, key ID ef8d349f
-MD5 digest: OK (27353c6153068a3c9902fcb4ad5b8b92)
 DOC
       }
       let(:sles12_signed_response) { <<-DOC
@@ -40,10 +33,6 @@ DOC
         allow(Pkg::Sign::Rpm).to receive(:`).and_return(el7_signed_response)
         expect(Pkg::Sign::Rpm.has_sig?(rpm)).to be true
       end
-      it 'returns true if rpm has been signed (el5)' do
-        allow(Pkg::Sign::Rpm).to receive(:`).and_return(el5_signed_response)
-        expect(Pkg::Sign::Rpm.has_sig?(rpm)).to be true
-      end
       it 'returns true if rpm has been signed (sles12)' do
         allow(Pkg::Sign::Rpm).to receive(:`).and_return(sles12_signed_response)
         expect(Pkg::Sign::Rpm.has_sig?(rpm)).to be true
@@ -68,7 +57,6 @@ DOC
         "#{rpm_directory}/aix/7.1/PC1/ppc/puppet-agent-5.5.3-1.aix7.1.ppc.rpm",
       ] }
       let(:v3_rpms) { [
-        "#{rpm_directory}/el/5/PC1/i386/puppet-agent-5.5.3-1.el5.i386.rpm",
         "#{rpm_directory}/sles/11/PC1/x86_64/puppet-agent-5.5.3-1.sles11.x86_64.rpm",
       ] }
       let(:v4_rpms) { [

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

@@ -51,7 +51,6 @@ describe '#Pkg::Util::Ship' do
     pkg/sles/12/puppet6/ppc64le/puppet-agent-6.19.0-1.sles12.ppc64le.rpm
     pkg/sles/12/puppet6/x86_64/puppet-agent-6.19.0-1.sles12.x86_64.rpm
     pkg/sles/15/puppet6/x86_64/puppet-agent-6.19.0-1.sles15.x86_64.rpm
-    pkg/apple/10.14/puppet6/x86_64/puppet-agent-6.19.0-1.osx10.14.dmg
     pkg/apple/10.15/puppet6/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg
     pkg/fedora/32/puppet6/x86_64/puppet-agent-6.19.0-1.fc32.x86_64.rpm
     pkg/windows/puppet-agent-6.19.0-x64.msi
@@ -71,7 +70,6 @@ describe '#Pkg::Util::Ship' do
     pkg/puppet6/sles/12/ppc64le/puppet-agent-6.19.0-1.sles12.ppc64le.rpm
     pkg/puppet6/sles/12/x86_64/puppet-agent-6.19.0-1.sles12.x86_64.rpm
     pkg/puppet6/sles/15/x86_64/puppet-agent-6.19.0-1.sles15.x86_64.rpm
-    pkg/mac/puppet6/10.14/x86_64/puppet-agent-6.19.0-1.osx10.14.dmg
     pkg/mac/puppet6/10.15/x86_64/puppet-agent-6.19.0-1.osx10.15.dmg
     pkg/puppet6/fedora/32/x86_64/puppet-agent-6.19.0-1.fc32.x86_64.rpm
     pkg/windows/puppet6/puppet-agent-6.19.0-x64.msi

data/tasks/deb_repos.rake

@@ -10,6 +10,7 @@
 #
 namespace :pl do
   namespace :jenkins do
+    # The equivalent to invoking this task is calling Pkg::Util::Repo.deb_repos
     desc "Create apt repositories of build DEB packages for this SHA on the distributions erver"
     task :deb_repos => "pl:fetch" do
       Pkg::Deb::Repo.create_repos

data/tasks/fetch.rake

@@ -26,6 +26,7 @@ end
 # It uses curl to download the files, and places them in a temporary
 # directory, e.g. /tmp/somedirectory/{project,team}/Pkg::Config.builder_data_file
 namespace :pl do
+  # The equivalent to invoking this task is calling Pkg::Util::File.fetch
   desc "retrieve build-data configurations to override/extend local build_defaults"
   task :fetch do
     # Remove .packaging directory from old-style extras loading

data/tasks/load_extras.rake

@@ -6,6 +6,7 @@
 # generic tasks with data not generally useful outside the
 # PL Release team
 namespace :pl do
+  # The equivalent to invoking this task is calling Pkg::Util::File.load_extras(temp_directory)
   task :load_extras, :tempdir do |t, args|
     unless ENV['PARAMS_FILE'] && ENV['PARAMS_FILE'] != ''
       tempdir = args.tempdir

data/tasks/rpm_repos.rake

@@ -11,6 +11,7 @@
 #
 namespace :pl do
   namespace :jenkins do
+    # The equivalent to invoking this task is calling Pkg::Util::Repo.rpm_repos
     desc "Create yum repositories of built RPM packages for this SHA on the distribution server"
     task :rpm_repos => "pl:fetch" do
       Pkg::Rpm::Repo.create_remote_repos

data/tasks/ship.rake

@@ -645,6 +645,7 @@ namespace :pl do
   # server path. That way we can separate out built artifacts from
   # signed/actually shipped artifacts e.g. $path/shipped/ or $path/artifacts.
   namespace :jenkins do
+    # The equivalent to invoking this task is calling Pkg::Util::Ship.ship_to_artifactory(local_directory, target)
     desc 'ship pkg directory contents to artifactory'
     task :ship_to_artifactory, :local_dir do |_t, args|
       Pkg::Util::RakeUtils.invoke_task('pl:fetch')
@@ -673,6 +674,7 @@ namespace :pl do
       end
     end
 
+    # The equivalent to invoking this task is calling Pkg::Util::Ship.ship(local_directory, target)
     desc 'Ship "pkg" directory contents to distribution server'
     task :ship, :target, :local_dir do |_t, args|
       Pkg::Util::RakeUtils.invoke_task('pl:fetch')

data/tasks/sign.rake

@@ -107,8 +107,8 @@ namespace :pl do
   ##
   # This crazy piece of work establishes a remote repo on the signing
   # server, ships our packages out to it, signs them, and brings them back.
-  #
   namespace :jenkins do
+    # The equivalent to invoking this task is calling Pkg::Util::Sign.sign_all(root_directory)
     desc "Sign all locally staged packages on #{Pkg::Config.signing_server}"
     task :sign_all, :root_dir do |_t, args|
       Pkg::Util::RakeUtils.invoke_task('pl:fetch')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: packaging
 version: !ruby/object:Gem::Version
-  version: 0.104.0
+  version: 0.105.0
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug
@@ -188,8 +188,10 @@ files:
 - lib/packaging/util/os.rb
 - lib/packaging/util/platform.rb
 - lib/packaging/util/rake_utils.rb
+- lib/packaging/util/repo.rb
 - lib/packaging/util/serialization.rb
 - lib/packaging/util/ship.rb
+- lib/packaging/util/sign.rb
 - lib/packaging/util/tool.rb
 - lib/packaging/util/version.rb
 - lib/packaging/util/windows.rb
@@ -293,28 +295,28 @@ signing_key:
 specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging_spec.rb
+- spec/lib/packaging/artifactory_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/paths_spec.rb
 - spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/sign_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/util/version_spec.rb
+- spec/lib/packaging/util/os_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
 - spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/gpg_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/net_spec.rb
 - spec/lib/packaging/util/git_tag_spec.rb
-- spec/lib/packaging/util/os_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/util/jenkins_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/paths_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/deb/repo_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging_spec.rb
+- spec/lib/packaging/util/net_spec.rb
+- spec/lib/packaging/util/rake_utils_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/gem_spec.rb