packaging 0.99.75 → 0.99.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4eba143d4627b1c6ce1eb694894a79987fb4c9eb169a8de3dfe756c037f2cfd
-  data.tar.gz: fc772076ec4a28f57e2a99afb51a29ecba0d20b6b0eea0d32d16f43575f8c8d4
+  metadata.gz: 0d737ac46704906a2bc986128797b3db649dd3e35e1432f2a98f362da67ffa56
+  data.tar.gz: 7a1ae857ec7a92940499a60c9d649f5e5e40fd8f2340aa95d2751f0de29d9fbd
 SHA512:
-  metadata.gz: 5e6b6a56070e12ea898725f030d2cf95b6e04f6ac329f6dab38a20ab9aa765a3a7667f6967373dbde8cf8686403784ad9ca4e49bc83923e260a7c9517e457329
-  data.tar.gz: 5a3cadefed6983b5bcacf0f2abb117b8f2c5aa829dc8567a041b4e4b679d1489d8a2badb80a1c7c1b0a51cbda94ad07d8f00d9378dcaca9ab02b4cd831aeab2f
+  metadata.gz: cacbbdc7c63c443a6a6bb6c0bc7f77367343b22b8356c4d99c00fe67a1fd448af0c7e0647d616ec533d1cb1cdfb6412fbff953bfb6926dbb4a06911d08da20df
+  data.tar.gz: 39ada32cc8dde4df7d661d00807ba937667338278191391ec534c98423228c594a49e2c74bedd10e9c8bd18601dae6bdff54804d48f2e255bc995b198bef4c13

data/README.md

@@ -404,7 +404,7 @@ deb_build_mirrors:
 # Who is packaging. Turns up in various packaging artifacts
 packager: 'puppetlabs'
 # GPG key ID of the signer
-gpg_key: '7F438280EF8D349F'
+gpg_key: '4528B6CD9E61EF26'
 # Whether to require tarball signing as a prerequisite of other package building
 sign_tar: false
 # a space separated list of mock configs. These are the rpm distributions to package for. If a noarch package, only one arch of each is needed.

data/lib/packaging/config.rb

@@ -6,6 +6,7 @@ module Pkg
   #
   class Config
     require 'packaging/config/params.rb'
+    require 'packaging/config/validations.rb'
     require 'yaml'
 
     class << self
@@ -389,6 +390,31 @@ 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/config/params.rb

@@ -363,6 +363,7 @@ module Pkg::Params
                     { :oldvar => :yum_host,               :newvar => :tar_host },
                  ]
 
+
   # These are variables that we have deprecated. If they are encountered in a
   # project's config, we issue deprecations for them.
   #
@@ -373,4 +374,14 @@ 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/validations.rb

@@ -0,0 +1,13 @@
+module Pkg
+  class ConfigValidations
+
+    class << self
+
+      # As a validation, this one is kindof lame but is intended as a seed pattern for possibly
+      # more robust ones.
+      def not_empty?(value)
+        value.to_s.empty? ? false : true
+      end
+    end
+  end
+end

data/lib/packaging/paths.rb

@@ -322,7 +322,8 @@ module Pkg::Paths
     if %w(puppet7 puppet7-nightly
           puppet6 puppet6-nightly
           puppet5 puppet5-nightly
-          puppet).include? repo_name
+          puppet  puppet-nightly
+          puppet-tools).include? repo_name
       return File.join(remote_repo_path, 'pool', code_name, repo_name, project[0], project)
     end
 

data/lib/packaging/platforms.rb

@@ -100,7 +100,7 @@ module Pkg
           repo: true,
         },
         '8' => {
-          architectures: ['x86_64', 'aarch64'],
+          architectures: ['x86_64', 'ppc64le', 'aarch64'],
           source_architecture: 'SRPMS',
           package_format: 'rpm',
           source_package_formats: ['src.rpm'],

data/lib/packaging/sign/msi.rb

@@ -71,9 +71,8 @@ for msipath in #{msis.join(" ")}; do
     echo "$msi is already signed, skipping . . ." ;
   else
     tries=5
-    sha1Servers=(http://timestamp.verisign.com/scripts/timstamp.dll
-    http://timestamp.globalsign.com/scripts/timstamp.dll
-    http://www.startssl.com/timestamp)
+    sha1Servers=(http://timestamp.digicert.com/sha1/timestamp
+    http://timestamp.comodoca.com/authenticode)
     for timeserver in "${sha1Servers[@]}"; do
       for ((try=1; try<=$tries; try++)) do
         ret=$(/cygdrive/c/tools/osslsigncode-fork/osslsigncode.exe sign \

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

@@ -17,7 +17,7 @@ describe "Pkg::Util::Git_tag" do
 
   context "branch?" do
     it "sets ref type as a branch when passed a branch" do
-      git_tag = Pkg::Util::Git_tag.new("git://github.com/puppetlabs/leatherman.git", "master")
+      git_tag = Pkg::Util::Git_tag.new("git://github.com/puppetlabs/leatherman.git", "main")
       expect(git_tag.branch?).to eq(true)
     end
   end

data/tasks/config.rake

@@ -6,6 +6,11 @@ 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

@@ -30,28 +30,31 @@ namespace :pl do
   task :fetch do
     # Remove .packaging directory from old-style extras loading
     rm_rf "#{ENV['HOME']}/.packaging" if File.directory?("#{ENV['HOME']}/.packaging")
+
     # Touch the .packaging file which is allows packaging to present remote tasks
     touch "#{ENV['HOME']}/.packaging"
 
     begin
-      temp_build_data_dir = Pkg::Util::File.mktemp
-      %x(git clone #{data_repo} #{temp_build_data_dir})
-      if $?.success?
-        Dir.chdir(temp_build_data_dir) do
-          [team_data_branch, project_data_branch].each do |branch|
-            %x(git checkout #{branch})
-            if $?.success?
-              Pkg::Util::RakeUtils.invoke_task("pl:load_extras", temp_build_data_dir)
-            else
-              warn "Unable to load build_defaults from branch '#{branch}' in '#{data_repo}'. Skipping."
-            end
+      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
+          Pkg::Util::RakeUtils.invoke_task('pl:load_extras', build_data_directory)
         end
-      else
-        fail "There was an error attempting to fetch the build-data repo. Maybe you do not have the correct permissions?"
       end
     ensure
-      rm_rf temp_build_data_dir
+      rm_rf build_data_directory
     end
+
+    Pkg::Util::RakeUtils.invoke_task('config:validate')
   end
 end

data/tasks/gem.rake

@@ -150,20 +150,10 @@ namespace :package do
     Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version
     package_gem
   end
-
-  # PA-3356: temporary task to ship puppet 7 nightly gem
-  # TODO: PA-3358 - remove when puppet 7 is officialy out
-  task :puppet_7_nightly_gem => ["clean"] do
-    Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version.gsub(/6\.\d+\.\d+/, '7.0.0')
-    package_gem
-  end
 end
 
 # An alias task to simplify our remote logic in jenkins.rake
 namespace :pl do
   task :gem => "package:gem"
   task :nightly_gem => "package:nightly_gem"
-  # PA-3356: temporary task to ship puppet 7 nightly gem
-  # TODO: PA-3358 - remove when puppet 7 is officialy out
-  task :puppet_7_nightly_gem => "package:puppet_7_nightly_gem"
 end

data/tasks/ship.rake

@@ -265,25 +265,6 @@ namespace :pl do
 
       Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.gem_host, command)
     end
-
-    # PA-3356: temporary task to link puppet 7 nightly gem
-    # TODO: PA-3358 - remove when puppet 7 is officialy out
-    desc "Remotely link puppet 7 nightly shipped gems to latest versions on #{Pkg::Config.gem_host}"
-    task link_puppet_7_nightly_shipped_gems_to_latest: 'pl:fetch' do
-      Pkg::Config.gemversion = Pkg::Util::Version.extended_dot_version.gsub(/6\.\d+\.\d+/, '7.0.0')
-
-      remote_path = Pkg::Config.nonfinal_gem_path
-      gems = FileList['pkg/*.gem'].map! { |path| path.gsub!('pkg/', '') }
-      command = %(cd #{remote_path}; )
-
-      command += gems.map! do |gem_name|
-        %(sudo ln -sf #{gem_name} #{gem_name.gsub(Pkg::Config.gemversion, 'latest')})
-      end.join(';')
-
-      command += %(; sync)
-
-      Pkg::Util::Net.remote_ssh_cmd(Pkg::Config.gem_host, command)
-    end
   end
 
   desc "Ship mocked rpms to #{Pkg::Config.yum_staging_server}"
@@ -463,6 +444,16 @@ namespace :pl do
     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
+
   desc 'Test out the ship requirements'
   task ship_check: 'pl:fetch' do
     errs = []
@@ -536,15 +527,6 @@ namespace :pl do
       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.75
+  version: 0.99.76
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-08 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -124,6 +124,7 @@ files:
 - lib/packaging/artifactory/extensions.rb
 - lib/packaging/config.rb
 - lib/packaging/config/params.rb
+- lib/packaging/config/validations.rb
 - lib/packaging/deb.rb
 - lib/packaging/deb/repo.rb
 - lib/packaging/gem.rb
@@ -260,27 +261,27 @@ specification_version: 4
 summary: Puppet Labs' packaging automation
 test_files:
 - spec/lib/packaging_spec.rb
-- spec/lib/packaging/rpm/repo_spec.rb
-- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/sign_spec.rb
 - spec/lib/packaging/deb/repo_spec.rb
+- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/paths_spec.rb
+- spec/lib/packaging/platforms_spec.rb
+- spec/lib/packaging/rpm/repo_spec.rb
+- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/deb_spec.rb
+- spec/lib/packaging/repo_spec.rb
+- spec/lib/packaging/config_spec.rb
+- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/execution_spec.rb
 - spec/lib/packaging/util/gpg_spec.rb
 - spec/lib/packaging/util/os_spec.rb
-- spec/lib/packaging/util/file_spec.rb
-- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/version_spec.rb
 - spec/lib/packaging/util/git_spec.rb
-- spec/lib/packaging/util/execution_spec.rb
-- spec/lib/packaging/util/misc_spec.rb
+- spec/lib/packaging/util/net_spec.rb
 - spec/lib/packaging/util/rake_utils_spec.rb
-- spec/lib/packaging/util/version_spec.rb
-- spec/lib/packaging/util/git_tag_spec.rb
 - spec/lib/packaging/util/jenkins_spec.rb
-- spec/lib/packaging/util/net_spec.rb
-- spec/lib/packaging/deb_spec.rb
-- spec/lib/packaging/config_spec.rb
-- spec/lib/packaging/artifactory_spec.rb
-- spec/lib/packaging/gem_spec.rb
+- spec/lib/packaging/util/git_tag_spec.rb
+- spec/lib/packaging/util/ship_spec.rb
+- spec/lib/packaging/util/file_spec.rb
 - spec/lib/packaging/tar_spec.rb
-- spec/lib/packaging/sign_spec.rb
-- spec/lib/packaging/repo_spec.rb
-- spec/lib/packaging/platforms_spec.rb
-- spec/lib/packaging/retrieve_spec.rb
+- spec/lib/packaging/artifactory_spec.rb