simp-rake-helpers 5.6.2 → 5.7.0

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/CHANGELOG

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

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/Rakefile

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

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/build/rpm_metadata/requires

@@ -0,0 +1,2 @@
+Requires: pupmod-simp-simplib >= 1.2.3
+Requires: pupmod-puppetlabs-stdlib >= 1.2.3

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/data/os/CentOS.yaml

@@ -0,0 +1,2 @@
+---
+testpackage::aliases    : ['files','nisplus']

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/data/os/RedHat.yaml

@@ -0,0 +1,2 @@
+---
+testpackage::aliases    : ['files','nisplus']

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/hiera.yaml

@@ -0,0 +1,14 @@
+---
+version: 4
+datadir: data
+hierarchy:
+  - name: "OS name"
+    backend: yaml
+    path: "os/%{facts.os.name}"
+
+  - name: "OS family"
+    backend: yaml
+    path: "os/%{facts.os.family}"
+
+  - name: "common"
+    backend: yaml

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/manifests/init.pp

@@ -0,0 +1,2 @@
+class testpackage {
+}

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/metadata.json

@@ -0,0 +1,37 @@
+{
+  "name":    "simp-testpackage",
+  "version": "1.0.0",
+  "author":  "simp",
+  "summary": "A SIMP Test Package for Testing Test Things",
+  "license": "Apache-2.0",
+  "source":  "https://github.com/simp/pupmod-imatest",
+  "project_page": "https://github.com/simp/pupmod-imatest",
+  "issues_url":   "https://simp/project.atlassian.net",
+  "tags": [ "simp", "test"],
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 1.1.0"
+    },
+    {
+      "name": "simp/simplib",
+      "version_requirement": ">= 1.1.0"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    }
+  ]
+}

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/CHANGELOG

@@ -0,0 +1,5 @@
+* Wed Dec 05 2018 Richard Stallman <rms@gnu.org> - 2.0.0-0
+- Remove unused data-in-modules files
+
+* Sat Dec 13 2014 Richard Stallman <rms@gnu.org> - 1.0.0-0
+- Behold, there was a brave GNU world....

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/Rakefile

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

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/build/rpm_metadata/requires

@@ -0,0 +1,2 @@
+Requires: pupmod-simp-simplib >= 1.2.3
+Requires: pupmod-puppetlabs-stdlib >= 1.2.3

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/data/os/CentOS.yaml

@@ -0,0 +1,2 @@
+---
+testpackage::aliases    : ['files','nisplus']

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/data/os/RedHat.yaml

@@ -0,0 +1,2 @@
+---
+testpackage::aliases    : ['files','nisplus']

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/hiera.yaml

@@ -0,0 +1,14 @@
+---
+version: 4
+datadir: data
+hierarchy:
+  - name: "OS name"
+    backend: yaml
+    path: "os/%{facts.os.name}"
+
+  - name: "OS family"
+    backend: yaml
+    path: "os/%{facts.os.family}"
+
+  - name: "common"
+    backend: yaml

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/manifests/init.pp

@@ -0,0 +1,3 @@
+class testpackage {
+# TODO
+}

data/spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/metadata.json

@@ -0,0 +1,37 @@
+{
+  "name":    "simp-testpackage",
+  "version": "2.0.0",
+  "author":  "simp",
+  "summary": "A SIMP Test Package for Testing Test Things",
+  "license": "Apache-2.0",
+  "source":  "https://github.com/simp/pupmod-imatest",
+  "project_page": "https://github.com/simp/pupmod-imatest",
+  "issues_url":   "https://simp/project.atlassian.net",
+  "tags": [ "simp", "test"],
+  "dependencies": [
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 1.1.0"
+    },
+    {
+      "name": "simp/simplib",
+      "version_requirement": ">= 1.1.0"
+    }
+  ],
+  "operatingsystem_support": [
+    {
+      "operatingsystem": "CentOS",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    },
+    {
+      "operatingsystem": "RedHat",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
+    }
+  ]
+}

data/spec/acceptance/nodesets/default.yml

@@ -18,10 +18,10 @@ HOSTS:
       - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel rpmdevtools which'
       # rvm build-deps
       - 'yum install -y libyaml-devel glibc-headers autoconf gcc-c++ glibc-devel readline-devel libffi-devel openssl-devel automake libtool bison sqlite-devel'
-      - 'runuser build_user -l -c "gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"'
+      - 'runuser build_user -l -c "{ gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3; } || { gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB ; }"'
       - 'runuser build_user -l -c "curl -sSL https://get.rvm.io | bash -s stable"'
-      - 'runuser build_user -l -c "rvm install 2.1"'
-      - 'runuser build_user -l -c "rvm use --default 2.1"'
+      - 'runuser build_user -l -c "rvm install 2.4"'
+      - 'runuser build_user -l -c "rvm use --default 2.4"'
       - 'runuser build_user -l -c "rvm all do gem install bundler"'
     mount_folders:
       folder1:
@@ -47,11 +47,10 @@ HOSTS:
       - 'yum install -y rpm-build augeas-devel createrepo genisoimage git gnupg2 libicu-devel libxml2 libxml2-devel libxslt libxslt-devel rpmdevtools clamav-update which'
       # rvm build-deps
       - 'yum install -y libyaml-devel glibc-headers autoconf gcc-c++ glibc-devel readline-devel libffi-devel openssl-devel automake libtool bison sqlite-devel'
-      - 'runuser build_user -l -c "gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB"'
-      - 'runuser build_user -l -c "gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3"'
+      - 'runuser build_user -l -c "{ gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3; } || { gpg2 --keyserver hkp://pgp.mit.edu --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB || gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 7D2BAF1CF37B13E2069D6956105BD0E739499BDB ; }"'
       - 'runuser build_user -l -c "curl -sSL https://get.rvm.io | bash -s stable"'
-      - 'runuser build_user -l -c "rvm install 2.1"'
-      - 'runuser build_user -l -c "rvm use --default 2.1"'
+      - 'runuser build_user -l -c "rvm install 2.4"'
+      - 'runuser build_user -l -c "rvm use --default 2.4"'
       - 'runuser build_user -l -c "rvm all do gem install bundler"'
       - 'yum install -y rpm-sign'
     mount_folders:
@@ -66,4 +65,4 @@ HOSTS:
 
 CONFIG:
   log_level: verbose
-  type:      foss
+  type:      aio

data/spec/acceptance/support/pkg_rpm_helpers.rb

@@ -29,7 +29,7 @@ module Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
       'postinstall'   => 'post',
       'preuninstall'  => 'preun',
       'postuninstall' => 'postun',
-      'posttrans'     => nil,
+      'posttrans'     => 'posttrans',
     }
   end
 
@@ -37,7 +37,7 @@ module Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
   # returns a Hash of information about an RPM file's scriptlets
   def rpm_scriptlets_for( host, rpm_file )
     _labels  = scriptlet_label_map.keys.join('|')
-    rx_scriptlet_blocks = /^(?<block>(?<scriptlet>#{_labels}) scriptlet.*?(\r|\n)(?<content>.*?))(?=\n#{_labels}|\Z)/m
+    rx_scriptlet_blocks = /^(?<block>(?<scriptlet>#{_labels}) scriptlet.*?(\r|\n)(?<content>.*?))(?=\n(#{_labels}) scriptlet|\Z)/m
 
     result = on host, %Q(rpm -qp --scripts #{rpm_file})
 

data/spec/lib/simp/packer/iso_vars_json_spec.rb

@@ -0,0 +1,65 @@
+require 'simp/packer/iso_vars_json'
+require 'spec_helper'
+require 'tmpdir'
+require 'json'
+
+describe Simp::Packer::IsoVarsJson do
+  DUMMY_CONTENT = 'Dummy text with known checksum'.freeze
+  DUMMY_CHECKSUM = 'bd6eae40b2b18359f33332dd5b1a3dd5c9e885240c3d4907d6a1208cdafa0003'.freeze
+
+  before do
+    @tmp_dir = Dir.mktmpdir(File.basename(__FILE__))
+    @iso = File.expand_path('fixture.iso', @tmp_dir)
+    File.open(@iso, 'w') { |f| f.puts DUMMY_CONTENT }
+    target_release = '6.3.0-Beta1'
+    target_data = {
+      'isos' => ['/path/to/CentOS-6.10-x86_64-bin-DVD1.iso', '/path/to/CentOS-6.10-x86_64-bin-DVD2.iso'],
+      'build_command' => "bundle exec rake build:auto[/path/to,#{target_release}]",
+      'os_version' => '6.10',
+      'flavor' => 'CentOS'
+    }
+    @var_json = described_class.new(@iso, target_release, target_data, :silent => true)
+  end
+
+  after do
+    FileUtils.remove_entry_secure @tmp_dir
+  end
+
+  let(:expected_checksum) { DUMMY_CHECKSUM }
+
+  describe '#data' do
+    it 'returns expected information for v1.0.0 format' do
+      expect(@var_json.data).to include(
+        'simp_vars_version' => '1.0.0',
+        'box_distro_release'  => 'SIMP-6.3.0-Beta1-CentOS-6.10',
+        'box_simp_release'    => '6.3.0-Beta1',
+        'iso_checksum'        => DUMMY_CHECKSUM,
+        'iso_checksum_type'   => 'sha256',
+        'dist_os_flavor'      => 'CentOS',
+        'dist_os_maj_version' => '6',
+        'dist_os_version'     => '6.10',
+        'dist_source_isos'    => 'CentOS-6.10-x86_64-bin-DVD1.iso:CentOS-6.10-x86_64-bin-DVD2.iso',
+        'packer_src_type'     => 'simp-iso',
+        'iso_builder'         => 'rubygem-simp-rake-helpers'
+      )
+    end
+  end
+
+  describe '#write' do
+    before (:each) { @var_json.write }
+
+    let(:json_file) { "#{File.basename(@iso, '.iso')}.json" }
+
+    it 'writes a .json file with the same name as the .iso' do
+      Dir.chdir(@tmp_dir) { |_dir| expect(File.exist?(json_file)).to be true }
+    end
+
+    it 'writes a .json file with expected data' do
+      Dir.chdir(@tmp_dir) do |_dir|
+        file_content = File.read(json_file)
+        file_data = JSON.parse(file_content)
+        expect(file_data['iso_checksum']).to eq expected_checksum
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.6.2
+  version: 5.7.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-02 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -159,16 +159,22 @@ dependencies:
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '2.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.25'
 - !ruby/object:Gem::Dependency
   name: r10k
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +251,7 @@ files:
 - bin/simp_rake_helpers
 - lib/simp/componentinfo.rb
 - lib/simp/local_gpg_signing_key.rb
+- lib/simp/packer/iso_vars_json.rb
 - lib/simp/rake.rb
 - lib/simp/rake/build/auto.rb
 - lib/simp/rake/build/build.rb
@@ -278,7 +285,7 @@ files:
 - 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_safely_upgrading_obsolete_modules_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
@@ -336,6 +343,22 @@ files:
 - 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
@@ -448,6 +471,7 @@ files:
 - spec/lib/simp/files/testpackage-multi.spec
 - spec/lib/simp/files/testpackage.spec
 - spec/lib/simp/local_gpg_signing_key_spec.rb.beaker-only
+- spec/lib/simp/packer/iso_vars_json_spec.rb
 - spec/lib/simp/rake/build/files/changed_name_mod/metadata.json
 - spec/lib/simp/rake/build/files/dependencies.yaml
 - spec/lib/simp/rake/build/files/malformed_dep_meta_mod/metadata.json

data/spec/acceptance/20_pkg_rpm_safely_upgrading_obsolete_modules_spec.rb

@@ -1,175 +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
-
-
-# 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