simp-rake-helpers 5.12.1 → 5.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7388326de128952bb5ef2936e36da77f08a7f1ce6eb2970bb4e56bd68ac79424
-  data.tar.gz: 32f0cb5e47e874d9135af87f915f76ce9c9983b96c50f74e9f035971f0953266
+  metadata.gz: 4da7d0cf624209586f4a159cd06bf86cc61da199ddecc3d2730e53a267225316
+  data.tar.gz: 44fcb7049d7a6a39b433e88de24894db6817fc06620fddc6ac7f67d3481c6a42
 SHA512:
-  metadata.gz: 7e34d9f14623fd9068226a074a43104943369e264d7b5ea3c92d0da3f72faeac929f66d9f48c4245a179f3654152a01f2fd8bfe7e2f76c071fd2ab23e9c2d18d
-  data.tar.gz: 3875e7ae51536e1dbe917e01ee7dd62b8fa6fd8b6cbdf524d6078dc10fd40e3315a847729838943333a120bf10f2a12958863da082e108f979c68fa15779628a
+  metadata.gz: 6f4a80dd4864f3ade29b60932b83d87b8d2fd56384fd03bc5df9de9a03f70f54445333e3654b3d2225d67e0ffdc5f1f772c5a23908a0ea40378c648043c00fb2
+  data.tar.gz: 862aaaac472efde1959b314d66ddb254379be34f2ecbfa1f4715fc58882010fcfc14c5caf41a090947b2d3955b2c27eb146bec1b2236a817caebc95ada01f857

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+### 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/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

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

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.2'
 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.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.noarch.rpm'
     )
 
 
@@ -101,7 +101,7 @@ 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|

data/spec/acceptance/{10_pkg_rpm_spec.rb → suites/default/10_pkg_rpm_spec.rb}

@@ -80,7 +80,7 @@ describe 'rake pkg:rpm' do
 
       context 'rpm building' do
 
-        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"}
 
         it 'can prep the package directories' do
@@ -107,7 +107,7 @@ describe 'rake pkg:rpm' do
         context 'using simpdefault.spec' do
 
           let(:build_type) {:default}
-          let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-0.noarch.rpm') }
+          let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-1.noarch.rpm') }
 
           it 'should create an RPM' do
             comment "produces RPM on #{host}"
@@ -119,8 +119,8 @@ describe 'rake pkg:rpm' do
             on host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-foo), :acceptable_exit_codes => [1]
             on host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-simplib)
             on host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-puppetlabs-stdlib)
-            on host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x 'pupmod-testpackage = 0.0.1-0')
-            on host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x 'simp-testpackage = 0.0.1-0')
+            on host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x 'pupmod-testpackage = 0.0.1-1')
+            on host, %(rpm -qp --provides #{testpackage_rpm} | grep -q -x 'simp-testpackage = 0.0.1-1')
             on host, %(rpm -qp --queryformat "[%{obsoletes}\\n]" #{testpackage_rpm} | grep -q "^pupmod-testpackage")
             on host, %(rpm -qp --queryformat "[%{obsoletes}\\n]" #{testpackage_rpm} | grep -q "^simp-testpackage")
 

data/spec/acceptance/{30_pkg_misc_spec.rb → suites/default/30_pkg_misc_spec.rb}

@@ -40,7 +40,7 @@ describe 'rake pkg:check_rpm_changelog' do
   hosts.each do |_host|
     context "on #{_host}" do
       let!(:host){ _host }
-      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' }
 
       it 'can prep the package directories' do
         testpackages = [

data/spec/acceptance/{55_build_pkg_signing_spec.rb → suites/default/55_build_pkg_signing_spec.rb}

@@ -85,7 +85,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
     # NOTE: This expired keydir actually works on EL7 and EL8, even though
     # the newer gpg version creates different files than those in this
     # directory.
-    "#{build_user_host_files}/spec/acceptance/files/build/pkg/gpg-keydir.expired.2018-04-06"
+    "#{build_user_host_files}/spec/acceptance/suites/default/files/build/pkg/gpg-keydir.expired.2018-04-06"
   end
 
   shared_examples 'it does not leave the gpg-agent daemon running' do