simp-rake-helpers 5.12.0 → 5.12.4

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 = [

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

@@ -10,7 +10,7 @@ shared_examples_for 'an RPM generator with edge cases' do
   it 'should use specified release number for the RPM' do
     on host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_release; #{rake_cmd} pkg:rpm")
     release_test_rpm = File.join(pkg_root_dir, 'testpackage_with_release',
-      'dist', 'pupmod-simp-testpackage-0.0.1-42.noarch.rpm')
+      'dist', "pupmod-simp-testpackage-0.0.1-42#{rpm_dist}.noarch.rpm")
     on host, %(test -f #{release_test_rpm})
   end
 
@@ -73,14 +73,14 @@ describe 'rake pkg:rpm' do
     copy_host_files_into_build_user_homedir(hosts)
   end
 
-
   hosts.each do |_host|
     context "on #{_host}" do
       let!(:host){ _host }
+      let(:rpm_dist){ on(host, %{rpm --eval '%{dist}'}).output.strip.gsub(/\.centos$/, '') }
 
       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#{rpm_dist}.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
@@ -320,7 +320,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
 
     it 'should corrupt the password of new key' do
       key_gen_file = File.join(dev_keydir, 'gengpgkey')
-      on(hosts, "sed -i -e \"s/^Passphrase: /Passphrase: OOPS/\" #{key_gen_file}")
+      on(hosts, "sed -ci -e \"s/^Passphrase: /Passphrase: OOPS/\" #{key_gen_file}")
     end
 
     include_examples('it begins with unsigned RPMs')

data/spec/acceptance/{support → suites/default/support}/build_project_helpers.rb

@@ -7,7 +7,7 @@ module Simp::BeakerHelpers::SimpRakeHelpers::BuildProjectHelpers
   #
   def scaffold_build_project(hosts, test_dir, opts = {})
     copy_host_files_into_build_user_homedir(hosts, opts)
-    skeleton_dir = "#{build_user_host_files}/spec/acceptance/files/build/project_skeleton/"
+    skeleton_dir = "#{build_user_host_files}/spec/acceptance/suites/default/files/build/project_skeleton/"
 
     on(hosts, %(mkdir "#{test_dir}"; chown build_user:build_user "#{test_dir}"), opts)
     on(hosts, %(#{run_cmd} "cp -aT '#{skeleton_dir}' '#{test_dir}'"), opts)

data/spec/spec_helper_acceptance.rb

@@ -27,6 +27,10 @@ RSpec.configure do |c|
   # ensure that environment OS is ready on each host
   fix_errata_on hosts
 
+  # Detect cases in which no examples are executed (e.g., nodeset does not
+  # have hosts with required roles)
+  c.fail_if_no_examples = true
+
   # Readable test descriptions
   c.formatter = :documentation
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.12.0
+  version: 5.12.4
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -305,8 +305,6 @@ files:
 - lib/simp/rake/fixtures.rb
 - lib/simp/rake/helpers.rb
 - lib/simp/rake/helpers/assets/Gemfile
-- lib/simp/rake/helpers/assets/rpm_spec/simp4.spec
-- lib/simp/rake/helpers/assets/rpm_spec/simp5.spec
 - lib/simp/rake/helpers/assets/rpm_spec/simp6.spec
 - lib/simp/rake/helpers/assets/rpm_spec/simpdefault.spec
 - lib/simp/rake/helpers/rpm_spec.rb
@@ -318,91 +316,91 @@ files:
 - lib/simp/rpm.rb
 - lib/simp/rpm_signer.rb
 - lib/simp/yum.rb
-- spec/acceptance/00_pkg_rpm_custom_scriptlets_spec.rb
-- spec/acceptance/10_pkg_rpm_spec.rb
-- spec/acceptance/30_pkg_misc_spec.rb
-- spec/acceptance/50_local_gpg_signing_key_spec.rb
-- spec/acceptance/55_build_pkg_signing_spec.rb
-- spec/acceptance/development/docker_env.sh
-- spec/acceptance/development/rerun_acceptance_tests.sh
-- spec/acceptance/development/vagrant_rsync.sh
-- spec/acceptance/files/asset/Rakefile
-- spec/acceptance/files/asset/build/asset.spec
-- spec/acceptance/files/asset_with_misordered_entries/Rakefile
-- spec/acceptance/files/asset_with_misordered_entries/build/asset_with_misordered_entries.spec
-- spec/acceptance/files/build/pkg/gpg-keydir.expired.2018-04-06/RPM-GPG-KEY-SIMP-Dev
-- spec/acceptance/files/build/pkg/gpg-keydir.expired.2018-04-06/gengpgkey
-- spec/acceptance/files/build/pkg/gpg-keydir.expired.2018-04-06/pubring.gpg
-- spec/acceptance/files/build/pkg/gpg-keydir.expired.2018-04-06/random_seed
-- spec/acceptance/files/build/pkg/gpg-keydir.expired.2018-04-06/run_gpg_agent
-- spec/acceptance/files/build/pkg/gpg-keydir.expired.2018-04-06/secring.gpg
-- spec/acceptance/files/build/pkg/gpg-keydir.expired.2018-04-06/trustdb.gpg
-- spec/acceptance/files/build/project_skeleton/Puppetfile.tracking
-- spec/acceptance/files/build/project_skeleton/README.md
-- spec/acceptance/files/build/project_skeleton/Rakefile
-- spec/acceptance/files/build/project_skeleton/src/assets/simp/build/simp.spec
-- spec/acceptance/files/module/CHANGELOG
-- spec/acceptance/files/module/Rakefile
-- spec/acceptance/files/module/metadata.json
-- spec/acceptance/files/module_with_misordered_entries/CHANGELOG
-- spec/acceptance/files/module_with_misordered_entries/Rakefile
-- spec/acceptance/files/module_with_misordered_entries/metadata.json
-- spec/acceptance/files/simplib/CHANGELOG
-- spec/acceptance/files/simplib/Rakefile
-- spec/acceptance/files/simplib/build/rpm_metadata/requires
-- spec/acceptance/files/simplib/metadata.json
-- spec/acceptance/files/testpackage/CHANGELOG
-- spec/acceptance/files/testpackage/README
-- spec/acceptance/files/testpackage/Rakefile
-- spec/acceptance/files/testpackage/build/rpm_metadata/requires
-- spec/acceptance/files/testpackage/metadata.json
-- spec/acceptance/files/testpackage/spec/classes/init_spec.rb
-- spec/acceptance/files/testpackage/spec/files/mock_something.rb
-- spec/acceptance/files/testpackage/utils/convert_v1_to_v2.rb
-- spec/acceptance/files/testpackage_custom_scriptlet/CHANGELOG
-- spec/acceptance/files/testpackage_custom_scriptlet/Rakefile
-- spec/acceptance/files/testpackage_custom_scriptlet/build/rpm_metadata/custom/overrides
-- spec/acceptance/files/testpackage_custom_scriptlet/build/rpm_metadata/requires
-- spec/acceptance/files/testpackage_custom_scriptlet/metadata.json
-- spec/acceptance/files/testpackage_missing_license/CHANGELOG
-- spec/acceptance/files/testpackage_missing_license/Rakefile
-- spec/acceptance/files/testpackage_missing_license/build/rpm_metadata/requires
-- spec/acceptance/files/testpackage_missing_license/metadata.json
-- spec/acceptance/files/testpackage_missing_metadata_file/CHANGELOG
-- spec/acceptance/files/testpackage_missing_metadata_file/Rakefile
-- spec/acceptance/files/testpackage_missing_metadata_file/build/rpm_metadata/requires
-- spec/acceptance/files/testpackage_missing_name/CHANGELOG
-- spec/acceptance/files/testpackage_missing_name/Rakefile
-- spec/acceptance/files/testpackage_missing_name/build/rpm_metadata/requires
-- spec/acceptance/files/testpackage_missing_name/metadata.json
-- spec/acceptance/files/testpackage_missing_source/CHANGELOG
-- spec/acceptance/files/testpackage_missing_source/Rakefile
-- spec/acceptance/files/testpackage_missing_source/build/rpm_metadata/requires
-- spec/acceptance/files/testpackage_missing_source/metadata.json
-- spec/acceptance/files/testpackage_missing_summary/CHANGELOG
-- spec/acceptance/files/testpackage_missing_summary/Rakefile
-- spec/acceptance/files/testpackage_missing_summary/build/rpm_metadata/requires
-- spec/acceptance/files/testpackage_missing_summary/metadata.json
-- spec/acceptance/files/testpackage_missing_version/CHANGELOG
-- spec/acceptance/files/testpackage_missing_version/Rakefile
-- spec/acceptance/files/testpackage_missing_version/build/rpm_metadata/requires
-- spec/acceptance/files/testpackage_missing_version/metadata.json
-- spec/acceptance/files/testpackage_with_bad_changelog_date/CHANGELOG
-- spec/acceptance/files/testpackage_with_bad_changelog_date/Rakefile
-- spec/acceptance/files/testpackage_with_bad_changelog_date/build/rpm_metadata/requires
-- spec/acceptance/files/testpackage_with_bad_changelog_date/metadata.json
-- spec/acceptance/files/testpackage_with_release/CHANGELOG
-- spec/acceptance/files/testpackage_with_release/Rakefile
-- spec/acceptance/files/testpackage_with_release/build/rpm_metadata/release
-- spec/acceptance/files/testpackage_with_release/build/rpm_metadata/requires
-- spec/acceptance/files/testpackage_with_release/metadata.json
-- spec/acceptance/files/testpackage_without_changelog/Rakefile
-- spec/acceptance/files/testpackage_without_changelog/build/rpm_metadata/requires
-- spec/acceptance/files/testpackage_without_changelog/metadata.json
 - spec/acceptance/nodesets/default.yml
-- spec/acceptance/support/build_project_helpers.rb
-- spec/acceptance/support/build_user_helpers.rb
-- spec/acceptance/support/pkg_rpm_helpers.rb
+- 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
+- spec/acceptance/suites/default/50_local_gpg_signing_key_spec.rb
+- spec/acceptance/suites/default/55_build_pkg_signing_spec.rb
+- spec/acceptance/suites/default/development/docker_env.sh
+- spec/acceptance/suites/default/development/rerun_acceptance_tests.sh
+- spec/acceptance/suites/default/development/vagrant_rsync.sh
+- spec/acceptance/suites/default/files/asset/Rakefile
+- spec/acceptance/suites/default/files/asset/build/asset.spec
+- spec/acceptance/suites/default/files/asset_with_misordered_entries/Rakefile
+- spec/acceptance/suites/default/files/asset_with_misordered_entries/build/asset_with_misordered_entries.spec
+- spec/acceptance/suites/default/files/build/pkg/gpg-keydir.expired.2018-04-06/RPM-GPG-KEY-SIMP-Dev
+- spec/acceptance/suites/default/files/build/pkg/gpg-keydir.expired.2018-04-06/gengpgkey
+- spec/acceptance/suites/default/files/build/pkg/gpg-keydir.expired.2018-04-06/pubring.gpg
+- spec/acceptance/suites/default/files/build/pkg/gpg-keydir.expired.2018-04-06/random_seed
+- spec/acceptance/suites/default/files/build/pkg/gpg-keydir.expired.2018-04-06/run_gpg_agent
+- spec/acceptance/suites/default/files/build/pkg/gpg-keydir.expired.2018-04-06/secring.gpg
+- spec/acceptance/suites/default/files/build/pkg/gpg-keydir.expired.2018-04-06/trustdb.gpg
+- spec/acceptance/suites/default/files/build/project_skeleton/Puppetfile.tracking
+- spec/acceptance/suites/default/files/build/project_skeleton/README.md
+- spec/acceptance/suites/default/files/build/project_skeleton/Rakefile
+- spec/acceptance/suites/default/files/build/project_skeleton/src/assets/simp/build/simp.spec
+- spec/acceptance/suites/default/files/module/CHANGELOG
+- spec/acceptance/suites/default/files/module/Rakefile
+- spec/acceptance/suites/default/files/module/metadata.json
+- spec/acceptance/suites/default/files/module_with_misordered_entries/CHANGELOG
+- spec/acceptance/suites/default/files/module_with_misordered_entries/Rakefile
+- spec/acceptance/suites/default/files/module_with_misordered_entries/metadata.json
+- spec/acceptance/suites/default/files/simplib/CHANGELOG
+- spec/acceptance/suites/default/files/simplib/Rakefile
+- spec/acceptance/suites/default/files/simplib/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/simplib/metadata.json
+- spec/acceptance/suites/default/files/testpackage/CHANGELOG
+- spec/acceptance/suites/default/files/testpackage/README
+- spec/acceptance/suites/default/files/testpackage/Rakefile
+- spec/acceptance/suites/default/files/testpackage/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/testpackage/metadata.json
+- spec/acceptance/suites/default/files/testpackage/spec/classes/init_spec.rb
+- spec/acceptance/suites/default/files/testpackage/spec/files/mock_something.rb
+- spec/acceptance/suites/default/files/testpackage/utils/convert_v1_to_v2.rb
+- spec/acceptance/suites/default/files/testpackage_custom_scriptlet/CHANGELOG
+- spec/acceptance/suites/default/files/testpackage_custom_scriptlet/Rakefile
+- spec/acceptance/suites/default/files/testpackage_custom_scriptlet/build/rpm_metadata/custom/overrides
+- spec/acceptance/suites/default/files/testpackage_custom_scriptlet/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/testpackage_custom_scriptlet/metadata.json
+- spec/acceptance/suites/default/files/testpackage_missing_license/CHANGELOG
+- spec/acceptance/suites/default/files/testpackage_missing_license/Rakefile
+- spec/acceptance/suites/default/files/testpackage_missing_license/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/testpackage_missing_license/metadata.json
+- spec/acceptance/suites/default/files/testpackage_missing_metadata_file/CHANGELOG
+- spec/acceptance/suites/default/files/testpackage_missing_metadata_file/Rakefile
+- spec/acceptance/suites/default/files/testpackage_missing_metadata_file/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/testpackage_missing_name/CHANGELOG
+- spec/acceptance/suites/default/files/testpackage_missing_name/Rakefile
+- spec/acceptance/suites/default/files/testpackage_missing_name/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/testpackage_missing_name/metadata.json
+- spec/acceptance/suites/default/files/testpackage_missing_source/CHANGELOG
+- spec/acceptance/suites/default/files/testpackage_missing_source/Rakefile
+- spec/acceptance/suites/default/files/testpackage_missing_source/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/testpackage_missing_source/metadata.json
+- spec/acceptance/suites/default/files/testpackage_missing_summary/CHANGELOG
+- spec/acceptance/suites/default/files/testpackage_missing_summary/Rakefile
+- spec/acceptance/suites/default/files/testpackage_missing_summary/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/testpackage_missing_summary/metadata.json
+- spec/acceptance/suites/default/files/testpackage_missing_version/CHANGELOG
+- spec/acceptance/suites/default/files/testpackage_missing_version/Rakefile
+- spec/acceptance/suites/default/files/testpackage_missing_version/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/testpackage_missing_version/metadata.json
+- spec/acceptance/suites/default/files/testpackage_with_bad_changelog_date/CHANGELOG
+- spec/acceptance/suites/default/files/testpackage_with_bad_changelog_date/Rakefile
+- spec/acceptance/suites/default/files/testpackage_with_bad_changelog_date/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/testpackage_with_bad_changelog_date/metadata.json
+- spec/acceptance/suites/default/files/testpackage_with_release/CHANGELOG
+- spec/acceptance/suites/default/files/testpackage_with_release/Rakefile
+- spec/acceptance/suites/default/files/testpackage_with_release/build/rpm_metadata/release
+- spec/acceptance/suites/default/files/testpackage_with_release/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/testpackage_with_release/metadata.json
+- spec/acceptance/suites/default/files/testpackage_without_changelog/Rakefile
+- spec/acceptance/suites/default/files/testpackage_without_changelog/build/rpm_metadata/requires
+- spec/acceptance/suites/default/files/testpackage_without_changelog/metadata.json
+- spec/acceptance/suites/default/support/build_project_helpers.rb
+- spec/acceptance/suites/default/support/build_user_helpers.rb
+- spec/acceptance/suites/default/support/pkg_rpm_helpers.rb
 - spec/acceptance/support/simp_rake_helpers.rb
 - spec/lib/simp/ci/files/global_nodesets_only/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/global_nodesets_only/spec/acceptance/nodesets/oel.yml