simp-rake-helpers 5.12.1 → 5.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7388326de128952bb5ef2936e36da77f08a7f1ce6eb2970bb4e56bd68ac79424
-  data.tar.gz: 32f0cb5e47e874d9135af87f915f76ce9c9983b96c50f74e9f035971f0953266
+  metadata.gz: af430b5f3668ec96a8f12d66b7210e176083e9377ccfefd06fa92050ee56f77a
+  data.tar.gz: 423871d8e7f99d01d6065809ea1cfea2b76abae47b84add3197b982d042b3de3
 SHA512:
-  metadata.gz: 7e34d9f14623fd9068226a074a43104943369e264d7b5ea3c92d0da3f72faeac929f66d9f48c4245a179f3654152a01f2fd8bfe7e2f76c071fd2ab23e9c2d18d
-  data.tar.gz: 3875e7ae51536e1dbe917e01ee7dd62b8fa6fd8b6cbdf524d6078dc10fd40e3315a847729838943333a120bf10f2a12958863da082e108f979c68fa15779628a
+  metadata.gz: 9424b979c1f67e6fba2ecedb6c8229e111c017a987f69ee7c9eea7db60d715b23530c91bd8baf01d44e11f0e1b16c73d016c13905c87e7f5540b7c5b072ab7bd
+  data.tar.gz: 9c43ca061b10e4241695b108af43a27c20e06f430d1cdaf349cd15e68333ee5f389e7f74427e9ab495cfc3f52df4786bf576ce99d00e66356c24db4b5d6694f0

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+### 5.12.5 / 2021-10-07
+- Fixed a bug where `build:auto` failed when building the SIMP ISO for EL7,
+  because the code attempted to move a directory onto itself.
+- Ensured GPG keys in simp-gpgkeys are available in the DVD overlay tar file
+
+### 5.12.4 / 2021-10-05
+- Ensure that the DIST qualifier is added to all built RPMs
+- Use the new SimpRepos directory layout when building an ISO using externally
+  copied repos.
+
+### 5.12.3 / 2021-09-15
+- Handle multiple options for required applications in build:auto
+- Allow users to populate a `reposync` directory in the YUM build space that
+  will overwrite any target directories on the ISO.
+  - The SIMP tarball is unpacked after the copy so you always get the latest
+    built artifacts.
+  - Pruning will not occur if this technique is used since it is presumed that
+    you are overwriting the data with authoritative content.
+- Added a helpful tip about updating vermap.yaml
+- Fixed the call to repoclosure if on a system with DNF
+- Added support for EL8 to vermap.yaml
+
+### 5.12.2 / 2021-06-22
+- Change to '-1' from '-0' as the default RPM release
+
 ### 5.12.1 / 2021-05-27
 - Default `@build_dir` to `@distro_build_dir` in build tasks
 - Use  `file --keep-going` in the **unpack** task's ISO validation check.  This

data/Gemfile

@@ -13,9 +13,6 @@ gem 'simp-build-helpers'
 gem 'simp-beaker-helpers'
 gem 'beaker-puppet_install_helper'
 gem 'rake', '>= 12.3.3'
-# You'll need the following if using podman until they are released upstream
-#gem 'beaker-docker', :git => 'https://github.com/trevor-vaughan/beaker-docker', :branch => 'support_rootless_podman'
-#gem 'docker-api', :git => 'https://github.com/trevor-vaughan/docker-api', :branch => 'podman-compat'
 gem 'beaker-docker'
 
 if puppetversion

data/README.md

@@ -26,7 +26,6 @@
     * [`rake pkg:rpm`](#rake-pkgrpm)
     * [`rake pkg:tar`](#rake-pkgtar)
 * [Limitations](#limitations)
-  * [Some versions of bundler fail on FIPS-enabled Systems](#some-versions-of-bundler-fail-on-fips-enabled-systems)
 * [Development](#development)
   * [License](#license)
   * [History](#history)
@@ -66,25 +65,6 @@ group :test do
   gem 'puppet', puppetversion
   gem 'beaker-rspec'
   gem 'vagrant-wrapper'
-
-  # Puppet 4+ has issues with Hiera 3.1+
-   if puppetversion.to_s =~ />(\d+)/
-     pversion = $1
-     else
-     pversion = puppetversion
-   end
-
-   if Gem::Dependency.new('puppet', '~> 4.0').match?('puppet', pversion)
-     gem 'hiera', '~> 3.0.0'
-   end
-
-  # simp-rake-helpers does not suport puppet 2.7.X
-  if "#{ENV['PUPPET_VERSION']}".scan(/\d+/).first != '2' &&
-      # simp-rake-helpers and ruby 1.8.7 bomb Travis tests
-      # TODO: fix upstream deps (parallel in simp-rake-helpers)
-      RUBY_VERSION.sub(/\.\d+$/,'') != '1.8'
-    gem 'simp-rake-helpers'
-  end
 end
 ```
 
@@ -164,7 +144,7 @@ directory .  The full list of files considered are:
 ├── CHANGELOG         # OPTIONAL written in RPM's CHANGELOG format
 └── build/            # OPTIONAL
     └── rpm_metadata/ # OPTIONAL
-        ├── release   # OPTIONAL defines the RPM's "-0" release number
+        ├── release   # OPTIONAL defines the RPM's "-<qualifier>" release qualifier
         ├── requires  # OPTIONAL supplementary 'Requires','Provides','Obsoletes'
         └── custom/   # OPTIONAL
           └── *       # OPTIONAL custom snippets in RPM .spec format
@@ -187,7 +167,7 @@ level of the project, if it exists.
 
     Example:
 
-        * Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0-0
+        * Mon Nov 06 2017 Tom Smith <tom.smith@simp.com> - 3.8.0
         - Add feature x
 
     **Important:** Note the leading zero in "`Nov 05`".  It is a convention
@@ -227,21 +207,6 @@ Build the tar package for the current SIMP project
 
 ## Limitations
 
-### Some versions of bundler fail on FIPS-enabled Systems
-
-This is a limitation of Bundler, not the gem.
-
-If you are running on a FIPS-enabled system, you will need to use
-`bundler '~> 1.14.0'` or `bundler '~> 1.16'`
-
-If you are using RVM, the appropriate steps are as follows:
-
-```shell
-rm Gemfile.lock ||:
-rvm @global do gem uninstall bundler -a -x
-rvm @global do gem install bundler -v '~> 1.14.0'
-```
-
 ## Development
 
 Please see the [SIMP Contribution Guidelines](https://simp-project.atlassian.net/wiki/display/SD/Contributing+to+SIMP).

data/Rakefile

@@ -1,5 +1,3 @@
-# -*- ruby -*-
-
 require "rubygems"
 require 'rake/clean'
 require 'find'
@@ -12,5 +10,6 @@ require 'rspec/core/rake_task'
 require 'simp/rake/rubygem'
 Simp::Rake::Rubygem.new(@package, @rakefile_dir)
 
+require 'simp/rake/beaker'
 
-# vim: syntax=ruby
+Simp::Rake::Beaker.new(Dir.pwd)

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

@@ -18,6 +18,8 @@ module Simp::Rake::Build
   class Auto < ::Rake::TaskLib
 
     # Commands that are required by some part of the rake stack
+    #
+    # Use an array for commands that may have multiple valid options
     BUILD_REQUIRED_COMMANDS = [
       'basename',
       'cat',
@@ -42,7 +44,7 @@ module Simp::Rake::Build
       'make',
       'mkdir',
       'mktemp',
-      'python',
+      ['python','python2','python3'],
       'readlink',
       'repoclosure',
       'rm',
@@ -62,7 +64,7 @@ module Simp::Rake::Build
       'wc',
       'which',
       'xargs',
-      'yum',
+      ['dnf','yum'],
       'yumdownloader'
     ]
 

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

@@ -204,7 +204,8 @@ module Simp::Rake::Build
 
             Dir.chdir(target_dir) do
               if File.exist?('packages.yaml')
-                known_package_hash = YAML::load_file('packages.yaml')
+                # The empty YAML file returns 'false'
+                known_package_hash = YAML::load_file('packages.yaml') || {}
               end
             end
 
@@ -276,7 +277,7 @@ module Simp::Rake::Build
                 pkg = downloaded_package_hash[pkg][:rpm_name]
               }.compact
 
-              if known_packages.empty? && downloaded_packages.empty?
+              if known_packages.empty? && downloaded_packages.empty? && Dir.glob('reposync/**/repomd.xml').empty?
                 fail <<-EOM
         Error: Could not find anything to do!
 

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

@@ -120,6 +120,9 @@ module Simp::Rake::Build
             end
           end
 
+          reposync_location = File.join(@build_dir,'yum_data','reposync')
+          reposync_active = !Dir.glob(File.join(reposync_location, '**', 'repomd.xml')).empty?
+
           tarfiles = File.directory?(tarball) ?
             Dir.glob("#{tarball}/*.tar.gz") : [tarball]
           vermap = YAML::load_file( File.join( File.dirname(__FILE__), 'vermap.yaml'))
@@ -171,6 +174,7 @@ module Simp::Rake::Build
               unless Array(vermap[simpver.split('.').first]).include?(baseosver.split('.').first)
                 if verbose
                   warn("Could not find SIMP version mapping for #{simpver} for Base OS #{baseosver}")
+                  warn("Do you need to update vermap.yaml in the Gem?")
                 end
 
                 next
@@ -186,40 +190,83 @@ module Simp::Rake::Build
                 end
               end
 
-              # Prune unwanted packages
-              begin
-                system("tar --no-same-permissions -C #{dir} -xzf #{tball} *simp_pkglist.txt")
-              rescue
-                # Does not matter if the command fails
-              end
 
-              pkglist_file = ENV.fetch(
-                'SIMP_PKGLIST_FILE',
-                File.join(dir,"#{baseosver.split('.').first}-simp_pkglist.txt")
-              )
-
-              puts
-              puts '-'*80
-              puts "### Pruning packages not in file '#{pkglist_file}'"
-              puts
-              puts '   (override this with `SIMP_PKGLIST_FILE=<file>`)'
-              puts
-              puts '-'*80
-              puts
-
-              if (args.prune.casecmp("false") != 0) && File.exist?(pkglist_file)
-                exclude_pkgs = Array.new
-                File.read(pkglist_file).each_line do |line|
-                  next if line =~ /^(\s+|#.*)$/
-                  exclude_pkgs.push(line.chomp)
+              repo_target_dir = dir
+
+              # If we've pulled in reposync directories, we expect them to
+              # completely overwrite the directory of the same name in the
+              # target ISO so no pruning is required
+              #
+              # Note: CASE MATTERS on the directory names
+              if reposync_active
+                # We're working with the new EL8+ layout, so we need to target
+                # the SimpRepos subdirectory
+                repo_target_dir = File.join(dir,'SimpRepos')
+                mkdir_p(repo_target_dir, :verbose => verbose)
+
+                repos_to_overwrite = Dir.glob(File.join(reposync_location, '*'))
+                  .delete_if{|x| !File.directory?(x)}
+                  .map{|x| File.basename(x)}
+
+                repos_to_overwrite.each do |repo|
+                  src = File.join(reposync_location, repo)
+                  target = File.join(dir, repo)
+
+                  if File.directory?(target)
+                    rm_rf(target, :verbose => verbose) if File.directory?(target)
+                  else
+                    target = File.join(repo_target_dir, repo)
+                  end
+
+                  cp_r(src, target, :verbose => verbose)
+                end
+              else
+                # Prune unwanted packages
+                begin
+                  system("tar --no-same-permissions -C #{repo_target_dir} -xzf #{tball} *simp_pkglist.txt")
+                rescue
+                  # Does not matter if the command fails
+                end
+
+                pkglist_file = ENV.fetch(
+                  'SIMP_PKGLIST_FILE',
+                  File.join(dir,"#{baseosver.split('.').first}-simp_pkglist.txt")
+                )
+
+                puts
+                puts '-'*80
+                puts "### Pruning packages not in file '#{pkglist_file}'"
+                puts
+                puts '   (override this with `SIMP_PKGLIST_FILE=<file>`)'
+                puts
+                puts '-'*80
+                puts
+
+                if (args.prune.casecmp("false") != 0) && File.exist?(pkglist_file)
+                  exclude_pkgs = Array.new
+                  File.read(pkglist_file).each_line do |line|
+                    next if line =~ /^(\s+|#.*)$/
+                    exclude_pkgs.push(line.chomp)
+                  end
+                  prune_packages(dir,['SIMP','SimpRepos'],exclude_pkgs,mkrepo)
                 end
-                prune_packages(dir,['SIMP'],exclude_pkgs,mkrepo)
               end
 
               # Add the SIMP code
               system("tar --no-same-permissions -C #{dir} -xzf #{tball}")
 
-              Dir.chdir("#{dir}/SIMP") do
+              # Pop the SIMP directory from the tarball into the correct spot
+              # FIXME: This is a hack
+              unless dir == repo_target_dir
+                simpdir = File.join(dir,'SIMP')
+
+                if File.directory?(simpdir)
+                   cp_r(simpdir, repo_target_dir, :verbose => verbose)
+                   rm_rf(simpdir, :verbose => verbose)
+                end
+              end
+
+              Dir.chdir("#{repo_target_dir}/SIMP") do
                 # Add the SIMP Dependencies
                 simp_base_ver = simpver.split('-').first
 
@@ -230,13 +277,14 @@ module Simp::Rake::Build
                   yum_dep_location = File.join(@build_dir,'yum_data',simp_dep_src,'packages')
                 end
 
+                yum_dep_rpms = Dir.glob(File.join(yum_dep_location,'*.rpm'))
+
                 unless File.directory?(yum_dep_location)
-                  fail("Could not find dependency directory at #{yum_dep_location}")
+                  fail("Could not find dependency directory at #{yum_dep_location}") unless reposync_active
                 end
 
-                yum_dep_rpms = Dir.glob(File.join(yum_dep_location,'*.rpm'))
                 if yum_dep_rpms.empty?
-                  fail("Could not find any dependency RPMs at #{yum_dep_location}")
+                  fail("Could not find any dependency RPMs at #{yum_dep_location}") unless reposync_active
                 end
 
                 # Add any one-off RPMs that you might want to add to your own build
@@ -261,24 +309,76 @@ module Simp::Rake::Build
                   cp(rpm,rpm_arch, :verbose => verbose)
                 end
 
-                fail("Could not find architecture '#{arch}' in the SIMP distribution") unless File.directory?(arch)
-                # Get everything set up properly...
-                Dir.chdir(arch) do
-                  Dir.glob('../*') do |rpm_dir|
-                    # Don't dive into ourselves
-                    next if File.basename(rpm_dir) == arch
-
-                    Dir.glob(%(#{rpm_dir}/*.rpm)) do |source_rpm|
-                      link_target = File.basename(source_rpm)
-                      if File.exist?(source_rpm) && File.exist?(link_target)
-                        next if Pathname.new(source_rpm).realpath == Pathname.new(link_target).realpath
+                if reposync_active
+                    fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+                else
+                  ln_sf('noarch', arch, :verbose => verbose) if (!File.directory?(arch) && File.directory?('noarch'))
+                  fail("Could not find architecture '#{arch}' in the SIMP distribution") unless (File.directory?(arch) || File.symlink?(arch))
+
+                  # Get everything set up properly...
+                  Dir.chdir(arch) do
+                    Dir.glob('../*') do |rpm_dir|
+                      # Don't dive into ourselves
+                      next if File.basename(rpm_dir) == arch
+
+                      Dir.glob(%(#{rpm_dir}/*.rpm)) do |source_rpm|
+                        link_target = File.basename(source_rpm)
+                        if File.exist?(source_rpm) && File.exist?(link_target)
+                          next if Pathname.new(source_rpm).realpath == Pathname.new(link_target).realpath
+                        end
+
+                        ln_sf(source_rpm,link_target, :verbose => verbose)
                       end
-
-                      ln_sf(source_rpm,link_target, :verbose => verbose)
                     end
+
+                    fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+                  end
+                end
+              end
+
+              ### Munge the Repos
+
+              # Create an Updates directory that is properly populated
+              updates_readme = <<~README
+                This directory houses updates to NON-MODULAR RPMs.
+
+                DO NOT put modular RPMs in this directory or you will break your
+                system updates!
+                README
+
+              updates_dir = File.join(dir, 'Updates')
+              mkdir_p(updates_dir)
+
+              Dir.chdir(updates_dir) do
+                File.open('README','w'){|fh| fh.puts(updates_readme) }
+
+                repos = Dir.glob(File.join('..','**','repodata'))
+                modular_repos = Dir.glob(File.join('..','**','repodata','*-modules.*'))
+                non_modular_repos = repos.select{|x| modular_repos.grep(%r{^#{Regexp.escape(x)}}).empty? }
+                non_modular_repos.map!{|x| File.split(x).first}
+                non_modular_repos.delete_if{|x| x.match(%r{/SimpRepos|/SIMP}) }
+                non_modular_repos.each do |non_modular_repo|
+                  Dir.glob(File.join(non_modular_repo, '**', '*.rpm')).each do |rpm|
+                    # when non_modular_repo is '..', can still find RPMs we need
+                    # to exclude
+                    next if rpm.match(%r{/SimpRepos|/SIMP})
+
+                    ln_sf(rpm, '.', :verbose => verbose)
                   end
+                end
 
-                  fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+                fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+              end
+
+              # New ISO Layout
+              if reposync_active
+                Dir.chdir(repo_target_dir) do
+                  gpgkeysdir = File.join('SIMP','GPGKEYS')
+
+                  if File.directory?(gpgkeysdir)
+                    cp_r(gpgkeysdir, '.', :verbose => verbose)
+                    rm_rf(gpgkeysdir, :verbose => verbose)
+                  end
                 end
               end
 

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

@@ -606,23 +606,19 @@ protect=1
               mkdir_p('repos/lookaside')
               mkdir_p('repodata')
 
-              Dir.glob(args[:target_dir]).each do |base_dir|
-                Find.find(base_dir) do |path|
-                  if (path =~ /.*\.rpm$/) and (path !~ /.*.src\.rpm$/)
-                    sym_path = "repos/base/#{File.basename(path)}"
-                    ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
-                  end
-                end
+              Dir.glob(File.join(args[:target_dir], '**', '*.rpm'))
+                .delete_if{|x| x =~ /\.src\.rpm$/}
+                .each do |path|
+                  sym_path = "repos/base/#{File.basename(path)}"
+                  ln_sf(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
               end
 
               if args[:aux_dir]
-                Dir.glob(args[:aux_dir]).each do |aux_dir|
-                  Find.find(aux_dir) do |path|
-                    if (path =~ /.*\.rpm$/) and (path !~ /.*.src\.rpm$/)
-                      sym_path = "repos/lookaside/#{File.basename(path)}"
-                      ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
-                    end
-                  end
+                Dir.glob(File.join(args[:aux_dir], '**', '*.rpm'))
+                  .delete_if{|x| x =~ /\.src\.rpm$/}
+                  .each do |path|
+                    sym_path = "repos/lookaside/#{File.basename(path)}"
+                    ln_sf(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
                 end
               end
 
@@ -647,7 +643,11 @@ protect=1
                 file.write(ERB.new(yum_conf_template,nil,'-').result(binding))
               end
 
-              cmd = 'repoclosure -c repodata -n -t -r base -l lookaside -c yum.conf'
+              if which('dnf')
+                cmd = 'repoclosure -c base.conf --disablerepo=* --enablerepo=base'
+              else
+                cmd = 'repoclosure -c repodata -n -t -r base -l lookaside -c yum.conf'
+              end
 
               if ENV['SIMP_BUILD_verbose'] == 'yes'
                 puts

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

@@ -126,10 +126,16 @@ module Simp::Rake::Build
 
             Simp::RPM.copy_wo_vcs(@dvd_src,".",base_dir)
 
-            # Copy in the GPG Public Keys
+            # Copy in the GPG Public Keys from @build_dir
             mkdir_p("#{destdir}/GPGKEYS")
             ln(Dir.glob("#{@build_dir}/GPGKEYS/RPM-GPG-KEY*"), "#{destdir}/GPGKEYS", { :force => true })
 
+            # Copy in the GPG Public Keys packaged by simp-gpgkeys
+            simp_gpgkeys = File.join(@src_dir, 'assets', 'gpgkeys', 'GPGKEYS')
+            if Dir.exist?(simp_gpgkeys)
+              ln(Dir.glob("#{simp_gpgkeys}/RPM-GPG-KEY*"), "#{destdir}/GPGKEYS", { :force => true })
+            end
+
             # Copy in the auto-build RPMs
             Dir.chdir("#{@build_dir}/SIMP/RPMS") do
               Dir.glob('*').each do |type|

data/lib/simp/rake/build/vermap.yaml

@@ -1,5 +1,5 @@
 ---
-"6": ["6","7"]
+"6": ["6","7","8"]
 "5": "7"
 "4": "6"
 "2": "5"

data/lib/simp/rake/helpers/assets/rpm_spec/simp6.spec

@@ -106,8 +106,8 @@ package_name = "UNKNOWN"
 package_version = "UNKNOWN"
 module_license = "UNKNOWN"
 
--- Default to 0
-package_release = 0
+-- Default to 1
+package_release = 1
 
 lua_stderr("\n")
 lua_stderr("--------------------------------------------------------------------------------\n")
@@ -202,7 +202,7 @@ end
 --    only accepts release in SemVer \d+\.\d+\.\d+ release format)
 --
 --    This code will remove a '-rc0' style prerelease string from the RPM
---     Version, and use it as the default RPM Release (instead of '-0')
+--     Version, and use it as the default RPM Release (instead of '-1')
 
 local version_match = metadata:match('"version":%s+"(.-)"%s*,'):gsub('-.*','')
 if version_match then
@@ -301,7 +301,7 @@ end
 
 if req_file then
   for line in req_file:lines() do
-    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: "))
+    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: ") or line:match("^Recommends: "))
 
     if valid_line then
       module_requires = (module_requires .. "\n" .. line)
@@ -319,7 +319,7 @@ Summary:   %{module_name} Puppet Module
 Name:      %{package_name}
 
 Version:   %{lua: print(package_version)}
-Release:   %{lua: print(package_release)}
+Release:   %{lua: print(package_release)}%{?dist}
 License:   %{lua: print(module_license)}
 Group:     Applications/System
 Source0:   %{package_name}-%{version}-%{release}.tar.gz

data/lib/simp/rake/helpers/assets/rpm_spec/simpdefault.spec

@@ -106,8 +106,8 @@ package_name = "UNKNOWN"
 package_version = "UNKNOWN"
 module_license = "UNKNOWN"
 
--- Default to 0
-package_release = 0
+-- Default to 1
+package_release = 1
 
 lua_stderr("\n")
 lua_stderr("--------------------------------------------------------------------------------\n")
@@ -202,7 +202,7 @@ end
 --    only accepts release in SemVer \d+\.\d+\.\d+ release format)
 --
 --    This code will remove a '-rc0' style prerelease string from the RPM
---     Version, and use it as the default RPM Release (instead of '-0')
+--     Version, and use it as the default RPM Release (instead of '-1')
 
 local version_match = metadata:match('"version":%s+"(.-)"%s*,'):gsub('-.*','')
 if version_match then
@@ -301,7 +301,7 @@ end
 
 if req_file then
   for line in req_file:lines() do
-    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: "))
+    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: ") or line:match("^Recommends: "))
 
     if valid_line then
       module_requires = (module_requires .. "\n" .. line)
@@ -319,7 +319,7 @@ Summary:   %{module_name} Puppet Module
 Name:      %{package_name}
 
 Version:   %{lua: print(package_version)}
-Release:   %{lua: print(package_release)}
+Release:   %{lua: print(package_release)}%{?dist}
 License:   %{lua: print(module_license)}
 Group:     Applications/System
 Source0:   %{package_name}-%{version}-%{release}.tar.gz

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

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

data/lib/simp/rake/helpers.rb

@@ -20,8 +20,8 @@ class Simp::Rake::Helpers
     invalid_commands = Array.new
 
     Array(required_commands).each do |command|
-      unless Facter::Core::Execution.which(command)
-        invalid_commands << command
+      unless Array(command).find { |x| Facter::Core::Execution.which(x) }
+        invalid_commands << Array(command).join(' or ')
       end
     end
 

data/spec/acceptance/nodesets/default.yml

@@ -30,23 +30,7 @@ CONFIG:
     auth_methods:
       - password
   docker_preserve_image: true
-  # This is necessary for pretty much all containers
-  docker_cap_add:
-    - AUDIT_WRITE
   mount_folders:
     host_files:
       host_path: ./
       container_path: /host_files
-  # All items below this point are required for systemd
-    cgroup:
-      host_path: /sys/fs/cgroup
-      container_path: /sys/fs/cgroup
-      opts: 'ro'
-  dockeropts:
-    HostConfig:
-      Tmpfs:
-        '/run': 'rw,noexec,nosuid,nodev,size=65536k'
-        '/run/lock': 'rw,noexec,nosuid,nodev,size=65536k'
-        '/tmp': 'rw,exec,nosuid,nodev,size=65536k'
-        '/sys/fs/cgroup/systemd': 'rw,size=65536k'
-        '/var/log/journal': 'rw,noexec,nodev,nosuid,size=65536k'

data/spec/acceptance/{00_pkg_rpm_custom_scriptlets_spec.rb → suites/default/00_pkg_rpm_custom_scriptlets_spec.rb}

@@ -11,7 +11,7 @@ shared_examples_for 'an RPM generator with customized scriptlets' do
     scriptlets = rpm_scriptlets_for(
       host,
       "#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" +
-      'pupmod-simp-testpackage-0.0.1-0.noarch.rpm'
+      "pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm"
     )
 
     comment '...the expected scriptlet types are present'
@@ -69,7 +69,7 @@ shared_examples_for 'an RPM generator with customized triggers' do
     triggers = rpm_triggers_for(
       host,
       "#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" +
-      'pupmod-simp-testpackage-0.0.1-0.noarch.rpm'
+      "pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm"
     )
 
 
@@ -101,12 +101,13 @@ describe 'rake pkg:rpm with customized content' do
     copy_host_files_into_build_user_homedir(hosts)
   end
 
-  let(:pkg_root_dir){'/home/build_user/host_files/spec/acceptance/files'}
+  let(:pkg_root_dir){'/home/build_user/host_files/spec/acceptance/suites/default/files'}
   let(:testpackage_dir){"#{pkg_root_dir}/testpackage"}
 
   hosts.each do |_host|
     context "on #{_host}" do
       let!(:host){ _host }
+      let(:rpm_dist){ on(host, %{rpm --eval '%{dist}'}).output.strip.gsub(/\.centos$/, '') }
 
       it 'can prep the package directories' do
         testpackages = [