simp-rake-helpers 5.11.6 → 5.12.0

data/spec/lib/simp/rpm_spec.rb

@@ -366,11 +366,5 @@ describe Simp::RPM do
 
   describe '.create_rpm_build_metadata' do
   end
-
-  describe '.load_key' do
-  end
-
-  describe '.signrpm' do
-  end
 =end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.11.6
+  version: 5.12.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-09 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -273,7 +273,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -282,6 +281,7 @@ files:
 - Rakefile
 - bin/simp_rake_helpers
 - lib/simp/ci/gitlab.rb
+- lib/simp/command_utils.rb
 - lib/simp/componentinfo.rb
 - lib/simp/local_gpg_signing_key.rb
 - lib/simp/packer/iso_vars_json.rb
@@ -316,10 +316,10 @@ files:
 - lib/simp/rake/rubygem.rb
 - lib/simp/relchecks.rb
 - 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/20_pkg_rpm_upgrade_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
@@ -341,66 +341,24 @@ files:
 - 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/custom_scriptlet_triggers/pupmod-new-package-2.1/CHANGELOG
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/Rakefile
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/build/rpm_metadata/custom/overrides
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/build/rpm_metadata/requires
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/metadata.json
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-3.0/CHANGELOG
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-3.0/Rakefile
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-3.0/build/rpm_metadata/custom/overrides
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-3.0/build/rpm_metadata/requires
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-3.0/metadata.json
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-1.0/CHANGELOG
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-1.0/Rakefile
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-1.0/build/rpm_metadata/requires
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-1.0/metadata.json
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.0/CHANGELOG
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.0/Rakefile
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.0/build/rpm_metadata/requires
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.0/metadata.json
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.2/CHANGELOG
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.2/Rakefile
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.2/build/rpm_metadata/custom/overrides
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.2/build/rpm_metadata/requires
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.2/metadata.json
-- spec/acceptance/files/mock_packages/pupmod-puppetlabs-stdlib.spec
-- spec/acceptance/files/mock_packages/pupmod-simp-foo.spec
-- spec/acceptance/files/mock_packages/pupmod-simp-simplib.spec
-- spec/acceptance/files/mock_packages/rpmbuild.sh
-- spec/acceptance/files/mock_packages/simp-adapter.spec
-- spec/acceptance/files/mock_packages/simp-adapter/etc/simp/adapter_config.yaml
-- spec/acceptance/files/mock_packages/simp-adapter/usr/local/sbin/simp_rpm_helper
 - 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/package_upgrades/pupmod-simp-testpackage-1.0/CHANGELOG
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/Rakefile
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/build/rpm_metadata/requires
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/data/os/CentOS.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/data/os/RedHat.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/hiera.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/manifests/init.pp
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/metadata.json
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/CHANGELOG
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/Rakefile
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/build/rpm_metadata/requires
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/data/os/CentOS.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/data/os/RedHat.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/hiera.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/manifests/init.pp
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/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
@@ -451,27 +409,21 @@ files:
 - spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/nodesets/centos.yml
 - spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature-1/feature-1_spec.rb
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature_2/feature_2_spec.rb
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature_2/nodesets/default.yml
@@ -479,7 +431,6 @@ files:
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature-1/feature-1_spec.rb
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature_2/feature_2_spec.rb
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature_2/nodesets/default.yml
@@ -488,32 +439,26 @@ files:
 - spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/nodesets/centos.yml
-- spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/suites/default/class_spec.rb
 - spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/class_spec.rb
 - spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/nodesets/centos.yml
-- spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/nodesets/default.yml
 - spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/nodesets/oel.yml
 - spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/class_spec.rb
 - spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/nodesets/default.yml
 - spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/nodesets/oel.yml
 - spec/lib/simp/ci/gitlab_spec.rb
+- spec/lib/simp/command_utils_spec.rb
 - spec/lib/simp/componentinfo_changelog_regex_spec.rb
 - spec/lib/simp/componentinfo_spec.rb
-- spec/lib/simp/files/build/testpackage.spec
 - spec/lib/simp/files/componentinfo_spec/asset_missing_release/build/asset_missing_release.spec
 - spec/lib/simp/files/componentinfo_spec/asset_missing_version/build/asset_missing_version.spec
 - spec/lib/simp/files/componentinfo_spec/asset_with_dist_in_release/build/asset_with_dist_in_release.spec
@@ -616,9 +561,7 @@ files:
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/service.pp
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/metadata.json
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/centos-combined-x64.yml
-- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/classes/init_spec.rb
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper.rb
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper_acceptance.rb
@@ -627,6 +570,7 @@ files:
 - spec/lib/simp/relchecks_check_rpm_changelog_spec.rb
 - spec/lib/simp/relchecks_compare_latest_tag_spec.rb
 - spec/lib/simp/relchecks_create_tag_changelog_spec.rb
+- spec/lib/simp/rpm_signer_spec.rb
 - spec/lib/simp/rpm_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper_acceptance.rb
@@ -650,7 +594,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubyforge_project: 
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers

data/.travis.yml

@@ -1,41 +0,0 @@
----
-language: ruby
-cache: bundler
-sudo: false
-
-notifications:
-  email: false
-
-jobs:
-  include:
-  ###  Testing on Travis CI is indefinitely disabled
-  ###
-  ###  See:
-  ###    * https://blog.travis-ci.com/2020-11-02-travis-ci-new-billing
-  ###    * https://simp-project.atlassian.net/browse/SIMP-8703
-
-    - stage: deploy
-      rvm: 2.5.1
-      if: 'fork = false AND tag IS present'
-      script:
-        - true
-      before_deploy:
-        - "export GEM_VERSION=`ruby -r ./lib/simp/rake/helpers/version.rb -e 'puts Simp::Rake::Helpers::VERSION'`"
-        - '[[ $TRAVIS_TAG =~ ^${GEM_VERSION}$ ]]'
-      deploy:
-        - provider: rubygems
-          gemspec: simp-rake-helpers.gemspec
-          gem: simp-rake-helpers
-          api_key:
-            secure: "aoPmOZ3WgjNJ56UXmamKxaRv37iUaxKekAeS8n2fPk78X/nU2qGjdDHFH+SBrfl33PyzsGnS3WAANMKaIkAgssvKoaII/sAC+Sl6q1eyVUprZqloXrG+cHlnHY4GnziWEH3JrkHDChW0xoJq7hhpj7qTRKrEIp6nA25MjozjveoL+HH4kKy/ACJhiEdsYTFaDLYYFY50gGUL9KjIkwN6g9d+dIzG9JqcYoDbneQlO6/23yr4GiAHQ8HM1j5tUoBqJad+CWjWhSY7pbfYBy2ziwVhFy1qoOS4/bhlasRCsLTtz0AjjR0YWOhJap1vJqYhrSxtvhmVuzScmDkueAem/PfWS3XCQvbmjdmFMzPOxo0aRRJMlaeVWRsZ/aVFC7ngpRzokq1duZEKI47xZC27vJSOp3RZMmYl/7GsykoYkqHHsTvzSALEQiVtQq8sIOtN0JOTFI8H4LSMirXuqGq+SgCJiAQ3mQzSgh50TXiZaA2UPPcQaw4AzY36BRKs1cgw3cEWuL38O2cWUTAzEE4SUh499wrU5x+N0PsYL0AvMFONsRaq5epOYrlIL9UPSL/qZRLmzpcEWZRfOX4Ni5N6Aa9ZR8juenR6UmE79S2dupBxQeinkdfXuWznUZH7BcnUDoz8rErABpJGHNVY60dUO/s055WCr7Y95Gi+H75X9/I="
-          on:
-            tags: true
-            rvm: 2.5.1
-            condition: '($SKIP_PUBLISH != true)'
-        - provider: releases
-          api_key:
-            secure: "QKvAL4yAk8u9prJT6dFzKvszJfoo5/R9jIJ/WEUwdH17jij9Q/XhNrUzJZnrdVtqq4yCK6UqGqkRMMn2YLOKthoJycLEXzH+ZeCxBwzyN6uQkLmK5Mx43H+NNCsRkYTmcOdi4wJraWaWVq7XBxz6XdNRUkV99WyIh93wVnTwZuJxvF9koDFq+lRR4qRPh5Xn8HjKEZNPY7QHaecqsyWjgdEILWaQk/32IU20dLCT7U3jDdSuk92p24gWlkvTJ/gP+IYKWEPhgMMpx+WAtGGC+djMyZUrkaKEa/ennkOcFgqJ6UtDEInEtTBFWScGL70dwHORbEVExp9AKcLP3TmMyQ/36ybu7yrgcp6L995tM4Huez3GBM6NJ8xl/hYG3D1QwwoXGnWfUjQW2we7h8gcvl2yUSx59pb2V5QW3nCbD8rAiF/kpAcgwWyBT3iLpMer2j0Ux05NCBGqsltl9J944M+pLtO+YKldUw7uGDWMQQzq8/2m5+MoE4fvTgnaJ0rv0eRLWfNH2RQ565mE95nyJC/wXz/XB2v/KKHrf8FQZRIavH4Nuo4E2+tU8u2APU/n+gP8iQrtd86Nlo5RrBTu+NoDPDrM5OBnVYTT/AUAEUggXTPgZsqwZrSDSBEt0VbExnwQ5QMGIB9ZX+ZunrEZ6NeH8hV5hm67WYZ+qRFOPvI="
-          on:
-            tags: true
-            rvm: 2.5.1
-            condition: '($SKIP_PUBLISH != true)'

data/spec/acceptance/20_pkg_rpm_upgrade_spec.rb

@@ -1,236 +0,0 @@
-require 'spec_helper_acceptance'
-require_relative 'support/pkg_rpm_helpers'
-
-require 'beaker/puppet_install_helper'
-require 'json'
-
-RSpec.configure do |c|
-  c.include Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
-  c.extend  Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
-end
-
-# This tests RPM upgrade scenarios for components that use
-# simp-adapter's simp_rpm_helper to copy files from the RPM install
-# directory to a second destination directory
-
-
-shared_examples_for 'RPM generator' do
-  it 'should create RPMs' do
-    testpackages.each do |package|
-      on host, %Q(#{run_cmd} "cd #{pkg_root_dir}/#{package}; ) +
-                      %Q(rvm use default; bundle update --local || bundle update")
-      rpm_name = package.sub(/-[^-]+$/,'')
-      # In case previous tests haven't been clean
-      on host, "rpm -q #{rpm_name} && rpm -e #{rpm_name}; :"
-
-      on host, %(#{run_cmd} "cd #{pkg_root_dir}/#{package}; #{rake_cmd} pkg:rpm")
-    end
-  end
-end
-
-shared_examples_for 'an upgrade path that works safely with simp_rpm_helper' do |first_package_file, second_package_file|
-  let( :rpm_regex ) do
-    /^(?<name>pupmod-[a-z0-9_]+-[a-z0-9_]+)-(?<version>\d+\.\d+\.\d+)-(?<release>\d+)\..*\.rpm$/
-  end
-
-  let( :first_package_version ){ first_package_file.match(rpm_regex)['version'] }
-  let( :first_package_name ){ first_package_file.match(rpm_regex)['name'] }
-  let( :first_package_forge_name ){ first_package_name.sub(/^[^-]+-/,'') }
-  let( :first_package_module_name ){ first_package_forge_name.sub(/^[^-]+-/,'') }
-  let( :first_package_dir_name ){ first_package_name + '-' + first_package_version.sub(/\.\d+-\d+$/,'') }
-
-  let( :second_package_name ){ second_package_file.match(rpm_regex)['name'] }
-  let( :second_package_forge_name ){ second_package_name.sub(/^[^-]+-/,'') }
-  let( :second_package_module_name ){ second_package_forge_name.sub(/^[^-]+-/,'') }
-  let( :second_package_version ){ second_package_file.match(rpm_regex)['version'] }
-  let( :second_package_dir_name ){ second_package_name + '-' + second_package_version.sub(/\.\d+-\d+$/,'') }
-
-  context "When upgrading from #{first_package_file} to #{second_package_file}" do
-    it "should clean out any old installs" do
-      on host, "rpm -e #{first_package_name} &> /dev/null; " +
-               "rpm -e #{second_package_name} &> /dev/null ",
-               accept_all_exit_codes: true
-    end
-
-    it "should install #{first_package_file}" do
-      on host, "cd #{pkg_root_dir}/#{first_package_dir_name.gsub(/\.\d+$/,'')}; "+
-               "rpm -Uvh dist/#{first_package_file}"
-    end
-
-    it "should transfer contents of #{first_package_file} into the code directory" do
-      result = on host, "cat /opt/test/puppet/code/#{first_package_module_name}/metadata.json"
-      metadata = JSON.parse(result.stdout)
-      expect(metadata['name']).to eq first_package_forge_name
-      expect(metadata['version']).to eq first_package_version
-
-      # This verifies all files/dirs from the first package are copied
-      on host, "diff -r /usr/share/simp/modules/#{first_package_module_name} /opt/test/puppet/code/#{first_package_module_name}"
-    end
-
-    it "should upgrade to #{second_package_file}" do
-      on host, "cd #{pkg_root_dir}/#{second_package_dir_name.gsub(/\.\d+$/,'')}; rpm -Uvh dist/#{second_package_file}"
-    end
-
-    it "should transfer contents of #{second_package_file} into the code directory" do
-      result = on host, "cat /opt/test/puppet/code/#{second_package_module_name}/metadata.json"
-      metadata = JSON.parse(result.stdout)
-      expect(metadata['name']).to eq second_package_forge_name
-      expect(metadata['version']).to eq second_package_version
-
-      # This verifies all files/dirs from the second package are copied and
-      # no files/dirs onyn in the old package remain
-      on host, "diff -r /usr/share/simp/modules/#{second_package_module_name} /opt/test/puppet/code/#{second_package_module_name}"
-    end
-
-  end
-end
-
-describe 'rake pkg:rpm + component upgrade scenarios' do
-
-  before :all do
-    copy_host_files_into_build_user_homedir(hosts)
-
-    comment 'ensure the Puppet AIO is installed'
-    run_puppet_install_helper_on(hosts)
-
-    comment 'configure puppet agent to look like a Puppet server for simp_rpm_helper'
-    on hosts, '/opt/puppetlabs/bin/puppet config --section master set user root; ' +
-              '/opt/puppetlabs/bin/puppet config --section master set group root; ' +
-              '/opt/puppetlabs/bin/puppet config --section master set codedir /opt/test/puppet/code; ' +
-              '/opt/puppetlabs/bin/puppet config --section master set confdir /opt/test/puppet/code'
-
-
-    # TODO This mock simp-adapter has old functionality that corresponds to
-    #      SIMP < 6.4.0 (i.e, a version that rsync's modules to a directory).
-    #      Once SIMP 6.4.0 is released, we may want to update it to match that
-    #      of the newer simp-adapter (i.e., the version that creates and updates
-    #      local Git repositories). The tests that assume the copy behavior will
-    #      have to be updated as well.
-    comment 'build and install mock RPMs'
-    mock_pkg_dir = '/home/build_user/host_files/spec/acceptance/files/mock_packages'
-    on hosts, %Q[#{run_cmd} "cd #{mock_pkg_dir}; rm -rf pkg"]
-    on hosts, %Q[#{run_cmd} "cd #{mock_pkg_dir}; bash rpmbuild.sh simp-adapter.spec"]
-    on hosts, %Q[#{run_cmd} "cd #{mock_pkg_dir}; bash rpmbuild.sh pupmod-puppetlabs-stdlib.spec"]
-    on hosts, %Q[#{run_cmd} "cd #{mock_pkg_dir}; bash rpmbuild.sh pupmod-simp-simplib.spec"]
-    on hosts, %Q[#{run_cmd} "cd #{mock_pkg_dir}; bash rpmbuild.sh pupmod-simp-foo.spec"]
-
-    on hosts, %Q[rpm -Uvh "#{mock_pkg_dir}/pkg/dist/*.noarch.rpm"], acceptable_exit_codes: [0,1]
-  end
-
-  hosts.each do |_host|
-    context "on #{_host}" do
-      let!(:host){ _host }
-
-      # This tests standard upgrades, which should 
-      context 'with normal module RPM upgrades' do
-        let(:pkg_root_dir) do
-          '/home/build_user/host_files/spec/acceptance/files/package_upgrades'
-        end
-
-        let(:testpackages) do
-          [
-            'pupmod-simp-testpackage-1.0',
-            'pupmod-simp-testpackage-2.0',
-          ]
-        end
-
-        context 'RPM build' do
-          it_should_behave_like('RPM generator')
-        end
-
-        context 'RPM upgrades' do
-          it_should_behave_like('an upgrade path that works safely with simp_rpm_helper',
-                                'pupmod-simp-testpackage-1.0.0-0.noarch.rpm',
-                                'pupmod-simp-testpackage-2.0.0-0.noarch.rpm')
-        end
-
-        context 'RPM erase' do
-          it 'should remove copied files on an erase' do
-            on host, 'rpm -e pupmod-simp-testpackage'
-            on host, 'ls /opt/test/puppet/code/testpackage', acceptable_exit_codes: [2]
-          end
-        end
-
-        context 'RPM transaction state directory' do
-          it 'should use /var/lib/rpm-state/simp-adapter for RPM state' do
-            on host, 'test -d /var/lib/rpm-state/simp-adapter'
-          end
-
-          it 'should not use /%{_localstatedir}/lib/rpm-state/simp-adapter for RPM state' do
-            on host, "test ! -d '/%{_localstatedir}/lib/rpm-state/simp-adapter'"
-          end
-        end
-      end
-
-      # These tests demonstrate custom RPM triggers that work around the obsolete
-      # module RPM upgrate + simp_rpm_helper problem described in SIMP-3895:
-      #
-      #    https://simp-project.atlassian.net/browse/SIMP-3988
-      #
-      # The expected outcome is that simp_rpm_helper always ensures the correct
-      # content is installed after an upgrade, even during after a package has been
-      # obsoleted.  This is accomplished via %triggerpostun -- <name of old package>
-      #
-      # old 1.0 -> old 2.0 = no need for a trigger
-      # old 1.0 -> new 2.0 = must re-run simp_rpm_helper
-      # old 1.0 -> new 3.0 = must re-run simp_rpm_helper
-      # old 2.0 -> new 2.0 = must re-run simp_rpm_helper
-      # old 2.0 -> new 3.0 = must re-run simp_rpm_helper
-      # new 2.0 -> new 3.0 = no need for a trigger
-      #
-      context 'with module RPMs that are susceptible to SIMP-3895' do
-        let(:pkg_root_dir) do
-          '/home/build_user/host_files/spec/acceptance/files/custom_scriptlet_triggers'
-        end
-
-        let(:testpackages) do
-          [
-            'pupmod-old-package-1.0',
-            'pupmod-old-package-2.0',
-            'pupmod-old-package-2.2',
-            'pupmod-new-package-2.1',
-            'pupmod-new-package-3.0',
-          ]
-        end
-
-        context 'RPM build' do
-          it_should_behave_like('RPM generator')
-        end
-
-        context 'RPM upgrades' do
-          it_should_behave_like('an upgrade path that works safely with simp_rpm_helper',
-                                'pupmod-old-package-1.0.0-0.noarch.rpm',
-                                'pupmod-old-package-2.0.0-0.noarch.rpm')
-
-          it_should_behave_like('an upgrade path that works safely with simp_rpm_helper',
-                                'pupmod-old-package-1.0.0-0.noarch.rpm',
-                                'pupmod-new-package-2.1.0-0.noarch.rpm')
-
-          it_should_behave_like('an upgrade path that works safely with simp_rpm_helper',
-                                'pupmod-new-package-2.1.0-0.noarch.rpm',
-                                'pupmod-old-package-2.2.0-0.noarch.rpm')
-
-          it_should_behave_like('an upgrade path that works safely with simp_rpm_helper',
-                                'pupmod-old-package-1.0.0-0.noarch.rpm',
-                                'pupmod-new-package-3.0.0-0.noarch.rpm')
-
-          it_should_behave_like('an upgrade path that works safely with simp_rpm_helper',
-                                'pupmod-old-package-2.0.0-0.noarch.rpm',
-                                'pupmod-new-package-2.1.0-0.noarch.rpm')
-
-          it_should_behave_like('an upgrade path that works safely with simp_rpm_helper',
-                                'pupmod-old-package-2.0.0-0.noarch.rpm',
-                                'pupmod-new-package-3.0.0-0.noarch.rpm')
-
-          it_should_behave_like('an upgrade path that works safely with simp_rpm_helper',
-                                'pupmod-old-package-2.2.0-0.noarch.rpm',
-                                'pupmod-new-package-3.0.0-0.noarch.rpm')
-
-          it_should_behave_like('an upgrade path that works safely with simp_rpm_helper',
-                                'pupmod-new-package-2.1.0-0.noarch.rpm',
-                                'pupmod-new-package-3.0.0-0.noarch.rpm')
-        end
-      end
-    end
-  end
-end