simp-rake-helpers 5.19.0 → 5.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 712ebbbef14960ebc9864f75b77caf59b8729b7693a367e64ffe49275371cb28
-  data.tar.gz: 711c3270485ce9ff0f3466ab8303b012d68b6f55474e7009d9895587fb81321c
+  metadata.gz: b7e5f9fd7413d64412d81d2db783696705e1848437d9cb071213959f4931cfc3
+  data.tar.gz: 0a4a3c448f46f813a3d85ea7845811ab5d34b6ac9905ecc5693aba9c90379106
 SHA512:
-  metadata.gz: f79902f1dd6719f03790d72cea4e4439d672eb1406e2006fd30c4739823cb20dcaa203fe129d7e64eca582861128aecc0590c9db7db53b778b29e07a386742e7
-  data.tar.gz: bdd2c8bb2c50f0a680ca2e9c41b9184f60525332ec83b2cf4516f67cea0e791ae7f9a36d980f499a1812142c1f6839a9d6285662f69269a48e00f739a8e3b989
+  metadata.gz: 96727f2454c5899693fc2461038d6447a8945e8e76a20e89d2377ef229e7edd63f2e3f35fa1cd93fb189bc7ca71e034de2c508aa328927f91ee5eeceb7099d01
+  data.tar.gz: 53a726a06449d1f09c820d6c0fe7c14e01c0df67103520a0c4261c17c1bbaaed4b9f4c1c8c86553280691a1f3ecc45e3c2929510326276713d1fdb7ca0776748

data/.gitignore

@@ -8,3 +8,4 @@ Gemfile.lock
 *.swp
 *.sw[pnoqst]
 .vagrant
+.vendor

data/CHANGELOG.md

@@ -1,4 +1,32 @@
-### 5.19.0 /2023-03-20
+### 5.20.0 /2023-07-03
+- Added
+  - Support for `puppetlabs-spec-helper` 6.x and `puppet-lint`
+    - New gem dependencies:
+      - `metadata-json-lint`
+      - `puppet-lint-params_empty_string-check`
+  - Acceptance test/nodeset support for Puppet 8
+  - Modernized GHA PR test matrix
+- Changed
+  - Default Puppet = 7.x
+  - Default Ruby = 2.7
+- Fixed
+  - Don't fail when `metadata` task is not present
+  - Untangled non-standard GHA workflows
+  - Release workflow bug
+
+### 5.19.1 / 2023-05-15
+- Fixed
+  - Bumped required puppet version to < 9.0
+  - The base repo for the el7 ISO was unusable because the repodata for it
+    was being excluded on the unpack of the distribution ISO; In the case
+    of building an el7 iso, we now ensure the repodata directory exists.
+
+### 5.19.1 / 2023-03-27
+- Added
+  - Allow `SIMP_BUILD_PKG_require_rebuild` to be case-insensitive to
+    accommodate GHA
+
+### 5.19.0 / 2023-03-20
 - Added
   - `pkg:single` will skip the `require_rebuild?` logic
     when `SIMP_BUILD_PKG_require_rebuild=yes`
@@ -7,7 +35,7 @@
     now use `SIMP_BUILD_PKG_require_rebuild=yes`
 
 
-### 5.18.0 /2023-02-27
+### 5.18.0 / 2023-02-27
 - Added
   - `SIMP_BUILD_reposync_only` now excludes RPMs and yum repos from the ISO
     `unpack` task
@@ -16,12 +44,12 @@
   - EL7 ISO unpack no longer interferes with reposync repos when
     `SIMP_BUILD_reposync_only=yes`
 
-### 5.17.1 /2022-11-11
+### 5.17.1 / 2022-11-11
 - Fixed
   - Fixed an edge case where the `SIMP` directory YUM metadata was not
     present if you used `reposync` for everything but the `SIMP` directory
 
-### 5.17.0 /2022-10-30
+### 5.17.0 / 2022-10-30
 - Added
   - The RPM dependency file can now use `ignores` to remove items instead of
     needing to redefine the entire dependency stack to remove deps
@@ -167,7 +195,7 @@
   pkg:check_published.  Attempt as many checks as possible and then
   report all failures.
 
-### 5.10.0 /2019-08-30
+### 5.10.0 / 2019-08-30
 * Add initial linting tasks for CI configuration (simp:ci_lint and
   simp:gitlab_ci_lint).  The only checks currently being done are
   as follows:
@@ -177,7 +205,7 @@
     specifies the suite and nodeset to be used and that the specified
     suite and nodeset exist.
 
-### 5.9.1 /2019-08-06
+### 5.9.1 / 2019-08-06
 Fixed 2 bugs in the SIMP Puppet module generated RPM spec files
 * When SIMP Puppet module RPMs were installed, they created the wrong
   state directory, '/%{_localstatedir}/lib/rpm-state/simp-adapter'.

data/lib/simp/rake/build/pkg.rb

@@ -183,12 +183,12 @@ module Simp::Rake::Build
                 end
 
                 rpm_build_keys.each do |gpgkey|
-                  cp(gpgkey, dvd_dir, :verbose => @verbose)
+                  FileUtils.cp(gpgkey, dvd_dir, :verbose => @verbose)
                 end
               # Otherwise, make sure it isn't present for the build
               else
                 Dir[File.join(dvd_dir,'RPM-GPG-KEY-SIMP*')].each do |to_del|
-                  rm(to_del)
+                  FileUtils.rm(to_del)
                 end
               end
             end
@@ -754,7 +754,10 @@ module Simp::Rake::Build
           check_git:         false,
           prefix:            ''
         })
-          return true if ENV['SIMP_BUILD_PKG_require_rebuild'] =~ /\A(yes|always)\Z/i
+          always_require_rebuild = ENV.select{|x| x =~ /SIMP_BUILD_PKG_require_rebuild/i }
+          unless always_require_rebuild.empty?
+            return true if always_require_rebuild =~ /\A(yes|always)\Z/i
+          end
           result = false
           rpm_metadata = File.exist?(@rpm_dependency_file) ? YAML.load(File.read(@rpm_dependency_file)) : {}
           dir_relpath = Pathname.new(dir).relative_path_from(Pathname.new(Dir.pwd)).to_path

data/lib/simp/rake/build/unpack.rb

@@ -118,6 +118,9 @@ module Simp::Rake::Build
             print "#"
           end
         end
+
+        # The repodata directory needs to exist (but not be copied) for el7 distros
+        FileUtils.mkdir("#{out_dir}/repodata") if version.start_with?('7')
       end
     end
   end

data/lib/simp/rake/helpers/version.rb

@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '5.19.0'
+  VERSION = '5.20.0'
 end

data/lib/simp/rake/pupmod/helpers.rb

@@ -100,7 +100,7 @@ class Simp::Rake::Pupmod::Helpers < ::Rake::TaskLib
     end
 
     desc 'lint metadata.json'
-    Rake::Task[:metadata].clear
+    Rake::Task[:metadata].clear if Rake::Task.tasks.any?{ |x| x.name == 'metadata' }
     task :metadata => :metadata_lint
 
     # Read the metadata.json as a data structure

data/spec/acceptance/nodesets/default_ruby3_1.yml

@@ -0,0 +1,36 @@
+HOSTS:
+  el7-build-server:
+    roles:
+      - default
+      - build_server
+    platform: el-7-x86_64
+    hypervisor: docker
+    image: simpproject/simp_build_centos7_ruby3_1
+    docker_cmd: '/usr/sbin/sshd -D -E /var/log/sshd.log'
+
+  el8-build-server:
+    roles:
+      - build_server
+    platform: el-8-x86_64
+    hypervisor: docker
+    image: simpproject/simp_build_centos8_ruby3_1
+    docker_cmd: '["/sbin/init"]'
+    docker_preserve_image: true
+
+CONFIG:
+  log_level: verbose
+  type:      aio
+<% if ENV['BEAKER_PUPPET_COLLECTION'] -%>
+  puppet_collection: <%= ENV['BEAKER_PUPPET_COLLECTION'] %>
+<% else -%>
+  puppet_collection: puppet6
+<% end -%>
+  ssh:
+    password: root
+    auth_methods:
+      - password
+  docker_preserve_image: true
+  mount_folders:
+    host_files:
+      host_path: ./
+      container_path: /host_files

data/spec/acceptance/suites/default/55_build_pkg_signing_spec.rb

@@ -135,8 +135,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
     it 'creates GPG dev signing key and signs packages' do
       hosts.each do |host|
         # NOTE: pkg:signrpms will not actually fail if it can't sign a RPM
-        on(hosts, %(#{run_cmd} "cd '#{test_dir}'; #{signrpm_cmd}"), run_opts)
-
+        on(hosts, %(#{run_cmd} "cd '#{test_dir}'; SIMP_PKG_verbose=yes #{signrpm_cmd}"), run_opts)
         expect(file_exists_on(host,"#{dirs[host][:dvd_dir]}/RPM-GPG-KEY-SIMP-Dev")).to be true
 
         result = on(host, "rpm -qip '#{test_rpm}' | grep ^Signature", run_opts)

data/spec/acceptance/suites/default/support/build_project_helpers.rb

@@ -48,7 +48,7 @@ module Simp::BeakerHelpers::SimpRakeHelpers::BuildProjectHelpers
     maj_rel = facts['operatingsystemmajrelease'] ||
               facts.fetch('os', {}).fetch('release', {})['major'] ||
               facts['operatingsystemrelease'].split('.').first
-    architecture = facts['architecture']
+    architecture = facts['architecture'] || facts.dig('os','architecture')
 
     dir = "#{proj_dir}/build/distributions/#{name}/#{maj_rel}/#{architecture}"
     @distribution_dirs[host.to_s] = dir

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.19.0
+  version: 5.20.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-27 00:00:00.000000000 Z
+date: 2023-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -74,7 +74,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: puppet-lint-optional_default-check
   requirement: !ruby/object:Gem::Requirement
@@ -125,18 +125,58 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: puppet-lint-params_empty_string-check
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: puppetlabs_spec_helper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+- !ruby/object:Gem::Dependency
+  name: metadata-json-lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -177,16 +217,22 @@ dependencies:
   name: puppet-blacksmith
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 3.3.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
@@ -337,6 +383,7 @@ files:
 - lib/simp/rpm_signer.rb
 - lib/simp/yum.rb
 - spec/acceptance/nodesets/default.yml
+- spec/acceptance/nodesets/default_ruby3_1.yml
 - spec/acceptance/suites/default/00_pkg_rpm_custom_scriptlets_spec.rb
 - spec/acceptance/suites/default/10_pkg_rpm_spec.rb
 - spec/acceptance/suites/default/30_pkg_misc_spec.rb
@@ -612,8 +659,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers