simp-rake-helpers 5.3.0 → 5.4.1

data/lib/simp/rpm.rb

@@ -12,7 +12,7 @@ module Simp
     require 'rake'
 
     @@gpg_keys = Hash.new
-    attr_reader :verbose, :packages
+    attr_reader :verbose, :lua_debug, :packages
 
     if Gem.loaded_specs['rake'].version >= Gem::Version.new('0.9')
       def self.sh(args)
@@ -20,6 +20,10 @@ module Simp
       end
     end
 
+    def self.rpm_cmd
+      @rpm_cmd ||= (ENV.fetch('SIMP_RPM_LUA_debug','no') =='yes') ? "rpm -D 'lua_debug 1'" : 'rpm'
+    end
+
     # Constructs a new Simp::RPM object. Requires the path to the spec file, or
     # RPM, from which information will be gathered.
     #
@@ -38,6 +42,8 @@ module Simp
     #   apply when +rpm_source+ is an RPM spec file.
     # [rpm_name] The full name of the rpm
     def initialize(rpm_source)
+      @verbose = ENV.fetch('SIMP_RPM_verbose','no') =='yes'
+
       update_rpmmacros
 
       # Simp::RPM.get_info returns a Hash or an Array of Hashes.
@@ -52,7 +58,14 @@ module Simp
         @info[package_info[:basename]] = package_info
       end
 
+
       @packages = @info.keys
+
+      if @verbose
+        require 'pp'
+        puts "== Simp::RPM @packages"
+        puts @packages.pretty_inspect
+      end
     end
 
     # @returns The RPM '.dist' of the system. 'nil' will be will be returned if
@@ -60,7 +73,13 @@ module Simp
     def self.system_dist
       # We can only have one of these
       unless defined?(@@system_dist)
-        dist = %x(rpm -E '%{dist}' 2> /dev/null).strip.split('.')
+        cmd  = %Q(#{rpm_cmd} -E '%{dist}' 2> /dev/null)
+        if @verbose
+          puts "== Simp::RPM.system_dist"
+          puts "   #{cmd} "
+        end
+        dist = %x{#{cmd}}.strip.split('.')
+        puts "  result = '#{dist}'" if @verbose
 
         if dist.size > 1
           @@system_dist = '.' + dist[1]
@@ -106,6 +125,13 @@ module Simp
           fh.flush
         end
 
+        if @verbose
+          puts "== SIMP::RPM#update_rpmmacros:"
+          puts "   wrote to '#{rpmmacros_file}': "
+          puts "   #{'-'*20}"
+          puts rpmmacros.map{|x| "   #{x}\n"}.join
+          puts
+        end
         @@macros_updated = true
       end
     end
@@ -259,7 +285,11 @@ module Simp
     # stdout output and stderr output.
     # cmd:: command to be executed
     def self.execute(cmd)
-      #puts "Executing: [#{cmd}]"
+      if @verbose ||= ENV.fetch('SIMP_RPM_verbose','no') =='yes'
+        puts "== Simp::RPM.execute(#{cmd})"
+        puts "  #{cmd}"
+      end
+
       outfile = File.join('/tmp', "#{ENV['USER']}_#{SecureRandom.hex}")
       errfile = File.join('/tmp', "#{ENV['USER']}_#{SecureRandom.hex}")
       pid = spawn(cmd, :out=>outfile, :err=>errfile)
@@ -276,6 +306,13 @@ module Simp
 
       { :exit_status => exit_status, :stdout => stdout, :stderr => stderr }
     ensure
+      if @verbose
+        puts "    -------- exit_status: #{exit_status}"
+        puts "    -------- stdout ",''
+        puts File.readlines(outfile).map{|x| "    #{x}"}.join
+        puts '',"    -------- stderr ",''
+        puts File.readlines(errfile).map{|x| "    #{x}"}.join
+      end
       FileUtils.rm_f([outfile, errfile])
     end
 
@@ -313,9 +350,9 @@ module Simp
         :dist => system_dist
       }
 
-      rpm_version_query = %(rpm -q --queryformat '%{NAME} %{VERSION} %{RELEASE} %{ARCH}\n' 2>/dev/null)
+      rpm_version_query = %Q(#{rpm_cmd} -q --queryformat '%{NAME} %{VERSION} %{RELEASE} %{ARCH}\\n')
 
-      rpm_signature_query = %(rpm -q --queryformat '%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|\n\')
+      rpm_signature_query = %Q(#{rpm_cmd} -q --queryformat '%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|\\n')
 
       source_is_rpm = rpm_source.split('.').last == 'rpm'
       if source_is_rpm
@@ -373,6 +410,12 @@ EOE
         info_array << info
       end
 
+      if @verbose
+        puts "== SIMP::RPM.get_info"
+        require 'pp'
+        pp info_array
+      end
+
       if info_array.size == 1
         return info_array[0]
       else
@@ -387,7 +430,7 @@ EOE
     end
 
     def self.create_rpm_build_metadata(project_dir, srpms=nil, rpms=nil)
-      require 'yaml' 
+      require 'yaml'
 
       last_build = {
         'git_hash' => %x(git rev-list --max-count=1 HEAD).chomp,

data/spec/acceptance/00_pkg_rpm_custom_scriptlets_spec.rb

@@ -0,0 +1,117 @@
+require 'spec_helper_acceptance'
+require_relative 'support/pkg_rpm_helpers'
+
+RSpec.configure do |c|
+  c.include Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
+  c.extend  Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
+end
+
+shared_examples_for 'an RPM generator with customized scriptlets' do
+  it 'should create an RPM 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'
+    )
+
+    comment '...the expected scriptlet types are present'
+    expect(scriptlets.keys.sort).to eq [
+      'pretrans',
+      'preinstall',
+      'postinstall',
+      'preuninstall',
+      'postuninstall',
+    ].sort
+
+    comment '...there are no duplicates' # this *should* be impossible
+    expect(scriptlets.map{|k,v| v[:count]}.max).to be == 1
+
+    comment '...pretrans scriptlet contains custom content'
+    expect(scriptlets['pretrans'][:content]).to eq '-- Custom scriptlet'
+
+    comment '...preinstall scriptlet has been overridden with custom content'
+    expect(scriptlets['preinstall'][:bare_content]).to eq(
+      "echo 'I override the default %%pre section provided by the spec file.'"
+    )
+
+    comment '...remaining default scriptlets call simp_rpm_helper with correct arguments'
+    expected_simp_rpm_helper_scriptlets = scriptlet_label_map.select{|k,v| %w(post preun postun).include? v }
+    expected_simp_rpm_helper_scriptlets.each do |rpm_label, simp_helper_label|
+      expect(scriptlets[rpm_label][:bare_content]).to eq(
+         "/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='#{simp_helper_label}' --rpm_status=$1"
+      )
+    end
+  end
+end
+
+
+shared_examples_for 'an RPM generator with customized triggers' do
+
+  it 'should create an RPM 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'
+    )
+
+
+    comment '...the expected trigger types are present'
+    expect(triggers.keys.sort).to eq [
+      'triggerun scriptlet (using /bin/sh) -- bar',
+      'triggerun scriptlet (using /bin/sh) -- foo',
+    ]
+
+    comment '...there are no duplicates' # <-- this also should be impossible
+    expect(triggers.map{|k,v| v[:count]}.max).to be == 1
+
+    comment '..."triggerun -- foo" contains the expected content'
+    expect(triggers['triggerun scriptlet (using /bin/sh) -- foo'][:bare_content]).to eq(
+      %q{echo "The 'foo' package is great; why would you uninstall it?"}
+    )
+
+    comment '..."triggerun -- bar" contains the expected content'
+    expect(triggers['triggerun scriptlet (using /bin/sh) -- bar'][:bare_content]).to eq(
+      %q{echo "This trigger runs just before the 'bar' package's %%preun"}
+    )
+  end
+
+end
+
+describe 'rake pkg:rpm with customized content' do
+
+  before :all do
+    copy_host_files_into_build_user_homedir(hosts)
+  end
+
+  let(:pkg_root_dir){'/home/build_user/host_files/spec/acceptance/files'}
+  let(:testpackage_dir){"#{pkg_root_dir}/testpackage"}
+
+  hosts.each do |_host|
+    context "on #{_host}" do
+      let!(:host){ _host }
+
+      it 'can prep the package directories' do
+        testpackages = [
+         'testpackage_custom_scriptlet',
+        ]
+
+        testpackages.each do |package|
+          on hosts, %Q(#{run_cmd} "cd #{pkg_root_dir}/#{package}; ) +
+                    %Q(rvm use default; bundle update --local || bundle update")
+        end
+      end
+
+      context 'when valid custom content is defined under rpm_metadata' do
+
+        it 'should create an RPM' do
+          on host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_custom_scriptlet; #{rake_cmd} pkg:rpm")
+        end
+
+        it_should_behave_like 'an RPM generator with customized scriptlets'
+        it_should_behave_like 'an RPM generator with customized triggers'
+
+      end
+    end
+
+  end
+end

data/spec/acceptance/10_pkg_rpm_spec.rb

@@ -0,0 +1,153 @@
+require 'spec_helper_acceptance'
+require_relative 'support/pkg_rpm_helpers'
+
+RSpec.configure do |c|
+  c.include Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
+  c.extend  Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
+end
+
+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 pkg:rpm")
+    release_test_rpm = File.join(pkg_root_dir, 'testpackage_with_release',
+      'dist', 'pupmod-simp-testpackage-0.0.1-42.noarch.rpm')
+    on host, %(test -f #{release_test_rpm})
+  end
+
+  it 'should generate a changelog for the RPM when no CHANGELOG exists' do
+    on host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_without_changelog; #{rake_cmd} pkg:rpm")
+    changelog_test_rpm = File.join(pkg_root_dir, 'testpackage_without_changelog',
+      'dist', File.basename(testpackage_rpm))
+    on host, %(rpm --changelog -qp #{changelog_test_rpm} | grep -q 'Auto Changelog')
+  end
+
+  it 'should not require pupmod-simp-simplib for simp-simplib RPM' do
+    on host, %(#{run_cmd} "cd #{pkg_root_dir}/simplib; #{rake_cmd} pkg:rpm")
+    simplib_rpm = File.join(pkg_root_dir, 'simplib', 'dist',
+      File.basename(testpackage_rpm).gsub(/simp-testpackage-0.0.1/,'simp-simplib-1.2.3'))
+    on host, %(test -f #{simplib_rpm})
+    on host, %(rpm -qpR #{simplib_rpm} | grep -q pupmod-simp-simplib), {:acceptable_exit_codes => [1]}
+  end
+
+  it 'should not fail to create an RPM when the CHANGELOG has a bad date' do
+    on host,
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_bad_changelog_date; #{rake_cmd} pkg:rpm")
+
+    bad_date_test_rpm = File.join(pkg_root_dir, 'testpackage_with_bad_changelog_date',
+      'dist', File.basename(testpackage_rpm))
+    on host, %(test -f #{bad_date_test_rpm})
+  end
+
+  it 'should fail to create an RPM when metadata.json is missing' do
+    on host,
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_metadata_file; #{rake_cmd} pkg:rpm"),
+      :acceptable_exit_codes => [1]
+  end
+
+  it 'should fail to create an RPM when license metadata is missing' do
+    on host,
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_license; #{rake_cmd} pkg:rpm"),
+      :acceptable_exit_codes => [1]
+  end
+
+  it 'should fail to create an RPM when name metadata is missing' do
+    on host,
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_name; #{rake_cmd} pkg:rpm"),
+      :acceptable_exit_codes => [1]
+  end
+
+  it 'should fail to create an RPM when source metadata is missing' do
+    on host,
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_source; #{rake_cmd} pkg:rpm"),
+      :acceptable_exit_codes => [1]
+  end
+
+  it 'should fail to create an RPM when summary metadata is missing' do
+    on host,
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_summary; #{rake_cmd} pkg:rpm"),
+      :acceptable_exit_codes => [1]
+  end
+
+  it 'should fail to create an RPM when version metadata is missing' do
+    on host,
+      %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_missing_version; #{rake_cmd} pkg:rpm"),
+      :acceptable_exit_codes => [1]
+  end
+
+end
+
+describe 'rake pkg:rpm' do
+  before :all do
+    copy_host_files_into_build_user_homedir(hosts)
+  end
+
+
+  hosts.each do |_host|
+    context "on #{_host}" do
+      let!(:host){ _host }
+
+      context 'rpm building' do
+
+        let(:pkg_root_dir){'/home/build_user/host_files/spec/acceptance/files'}
+        let(:testpackage_dir){"#{pkg_root_dir}/testpackage"}
+
+        it 'can prep the package directories' do
+          testpackages = [
+           'simplib',
+           'testpackage',
+           'testpackage_missing_license',
+           'testpackage_missing_metadata_file',
+           'testpackage_missing_name',
+           'testpackage_missing_source',
+           'testpackage_missing_summary',
+           'testpackage_missing_version',
+           'testpackage_with_bad_changelog_date',
+           'testpackage_with_release',
+           'testpackage_without_changelog',
+          ]
+
+          testpackages.each do |package|
+            on hosts, %Q(#{run_cmd} "cd #{pkg_root_dir}/#{package}; ) +
+                      %Q(rvm use default; bundle update --local || bundle update")
+          end
+        end
+
+        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') }
+
+          it 'should create an RPM' do
+            comment "produces RPM on #{host}"
+            on host, %(#{run_cmd} "cd #{testpackage_dir}; #{rake_cmd} pkg:rpm")
+            on host, %(test -f #{testpackage_rpm})
+
+            comment 'produces RPM with appropriate dependencies'
+            on host, %(rpm -qpR #{testpackage_rpm} | grep -q simp-adapter)
+            on host, %(rpm -qpR #{testpackage_rpm} | grep -q pupmod-simp-foo)
+            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 --queryformat "[%{obsoletes}\\n]" #{testpackage_rpm} | grep -q "^pupmod-testpackage")
+            on host, %(rpm -qp --queryformat "[%{obsoletes}\\n]" #{testpackage_rpm} | grep -q "^simp-testpackage")
+
+            comment 'produces RPM with a sourced CHANGELOG'
+            on host, %(rpm --changelog -qp #{testpackage_rpm} | grep -q Stallman)
+
+            comment 'produces RPM with appropriate pre/post/preun/postun'
+            result = on host, %(rpm -qp --scripts #{testpackage_rpm})
+            scriptlets = result.stdout.scan( %r{^.*?scriptlet.*?/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage.*?$}m )
+
+            expect( scriptlets.grep( %r{\Apreinstall scriptlet.*\n/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='pre' --rpm_status=\$1\Z}m )).not_to be_empty
+            expect( scriptlets.grep( %r{\Apostinstall scriptlet.*\n/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='post' --rpm_status=\$1\Z}m )).not_to be_empty
+            expect( scriptlets.grep( %r{\Apreuninstall scriptlet.*\n/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='preun' --rpm_status=\$1\Z}m )).not_to be_empty
+            expect( scriptlets.grep( %r{\Apostuninstall scriptlet.*\n/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/testpackage --rpm_section='postun' --rpm_status=\$1\Z}m )).not_to be_empty
+          end
+
+          it_should_behave_like 'an RPM generator with edge cases'
+        end
+      end
+    end
+  end
+end

data/spec/acceptance/20_pkg_rpm_safely_upgrading_obsolete_modules_spec.rb

@@ -0,0 +1,175 @@
+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
+
+
+# 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
+
+
+shared_examples_for 'an upgrade path that works safely with rpm_simp_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
+    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
+    end
+
+
+  end
+end
+
+describe 'rake pkg:rpm + modules with customized content to safely upgrade obsoleted packagess' do
+
+  let(:pkg_root_dir) do
+    '/home/build_user/host_files/spec/acceptance/files/custom_scriptlet_triggers'
+  end
+
+  before :all do
+    copy_host_files_into_build_user_homedir(hosts)
+
+    comment 'ensure the Puppet AIO is installed'
+    ENV['PUPPET_INSTALL_TYPE'] ||= 'agent'
+    ENV['PUPPET_INSTALL_VERSION'] ||= '1.10.6'
+    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'
+
+
+    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 }
+
+      context 'with module RPMs that are suceptible to SIMP-3895' do
+
+        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
+
+        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
+
+        it_should_behave_like('an upgrade path that works safely with rpm_simp_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 rpm_simp_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 rpm_simp_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 rpm_simp_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 rpm_simp_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 rpm_simp_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 rpm_simp_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 rpm_simp_helper',
+                              'pupmod-new-package-2.1.0-0.noarch.rpm',
+                              'pupmod-new-package-3.0.0-0.noarch.rpm')
+      end
+    end
+  end
+end

data/spec/acceptance/development/docker_env.sh

@@ -0,0 +1,29 @@
+# Source this file within a docker container to set up convenience shell
+# variables & functions.
+#
+# Usage:
+#
+#    source /host_files/spec/acceptance/development/docker_env.sh [DIR]
+#
+#    # testing a particular
+#    source /host_files/spec/acceptance/development/docker_env.sh  /home/build_user/host_files/spec/acceptance/files/testpackage_custom_scriptlet
+
+
+export TERM=xterm
+export TOPWD=/home/build_user/host_files
+export TOPWD_FILES=${TOPWD}/spec/acceptance/files
+export TWD=${1:-$TOPWD_FILES/testpackage}
+export TW=$(basename ${TWD})
+export TWSPEC="$TWD/dist/tmp/testpackage.spec"
+alias  twd="cd $TWD"
+rug(){
+ runuser build_user -l -c "cd /$TOPWD; $@"
+}
+ru(){
+ runuser build_user -l -c "cd /$TWD; SIMP_RPM_LUA_debug=yes SIMP_RPM_verbose=yes SIMP_PKG_verbose=yes $@"
+}
+ru_specfile_rpm_q(){
+  ru "rpm -q -D 'pup_module_info_dir $TWD' --specfile $TWD/dist/tmp/testpackage.spec $@"
+}
+cd $TWD
+(yum install -y vim-enhanced tree > /dev/null &)

data/spec/acceptance/development/rerun_acceptance_tests.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Run this from your docker host to wipe out all containers and restart beaker
+# tests.
+
+# Find & kill running beaker containers
+(docker ps -a | grep -v CONT | awk '{print "docker kill " $1 "; docker rm " $1}') > /tmp/x.$$
+source /tmp/x.$$ && rm /tmp/x.$$
+
+if [[ $# -gt 0 ]]; then
+  BEAKER_destroy=no SIMP_RPM_LUA_debug=yes SIMP_RAKE_PKG_verbose=yes SIMP_RPM_verbose=yes $@
+else
+  # re-run acceptance tests
+  BEAKER_destroy=no SIMP_RPM_LUA_debug=yes SIMP_RAKE_PKG_verbose=yes SIMP_RPM_verbose=yes bundle exec rake acceptance
+fi

data/spec/acceptance/development/vagrant_rsync.sh

@@ -0,0 +1,23 @@
+vagrant rsync
+vagrant ssh -c "cd /vagrant; bundle --local || bundle; ls -l; source /vagrant/spec/acceptance/development/rerun_acceptance_tests.sh" -- -v
+
+
+[[ $? -eq 0 ]] && status=SUCCESS || status=FAILED
+echo
+echo ==================
+echo     $status
+echo ==================
+echo
+echo 'In order to troubleshoot directly on a container:'
+echo
+echo '  vagrant ssh                           # enter vagrant VM'
+echo '  docker ps                             # identify container to inspect'
+echo '  docker exec -it el6-build-server bash # log into container (example: el6-build-server)'
+echo
+echo '  source /host_files/spec/acceptance/development/docker_env.sh  '
+echo
+echo '    # or, to start testing a particular script'
+echo
+echo ' source /host_files/spec/acceptance/development/docker_env.sh /home/build_user/host_files/spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.0'
+echo
+echo ' ru "rpm -q --queryformat '%{NAME} %{VERSION} %{RELEASE} %{ARCH}\n' --specfile $TWD/dist/tmp/testpackage_custom_scriptlet.spec"'

data/spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/CHANGELOG

@@ -0,0 +1,2 @@
+* Sat Dec 13 2014 Richard Stallman <rms@gnu.org> - 0.0.1-0
+- Behold, there was a brave GNU world....

data/spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/Rakefile

@@ -0,0 +1,3 @@
+require 'simp/rake/pkg'
+
+Simp::Rake::Pkg.new( File.dirname( __FILE__ ) )

data/spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/build/rpm_metadata/custom/overrides

@@ -0,0 +1,14 @@
+%triggerpostun -- pupmod-old-package
+
+echo
+echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+echo "@@@@@@ Executing SIMP-3895 workaround @@@@@@"
+echo "@@@@@@                                @@@@@@"
+echo "@@@@@@  upgrading from obsoleted pkg  @@@@@@"
+echo "@@@@@@      'pupmod-old-package'      @@@@@@"
+echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+echo
+echo "pupmod-new-package: post   1=2 (triggered by: %triggerpostun -- pupmod-old-package)"
+
+# re-send the 'post' message
+/usr/local/sbin/simp_rpm_helper --rpm_dir=/usr/share/simp/modules/package --rpm_section='post' --rpm_status=2

data/spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/build/rpm_metadata/requires

@@ -0,0 +1 @@
+Obsoletes:      pupmod-old-package < 2.1.0