(CONT-812) Update acceptance test setup

Author: chelnak

Diff for: .fixtures.yml

@@ -3,4 +3,5 @@ fixtures:
     facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
     provision: 'https://github.com/puppetlabs/provision.git'
     puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
-  symlinks: []
+  symlinks:
+    test: "#{source_dir}/spec/fixtures/acceptance/modules/test"

Diff for: Rakefile

@@ -15,7 +15,12 @@ RSpec::Core::RakeTask.new(:spec) do |t|
   t.exclude_pattern = "spec/acceptance/**/*.rb"
 end
 
+RSpec::Core::RakeTask.new(:acceptance) do |t|
+  t.pattern = "spec/unit/**/*.rb"
+end
+
 task :spec => :spec_clean
+task :acceptance => :spec_prep
 
 # Add our own tasks
 require 'puppet-strings/tasks'
@@ -32,138 +37,3 @@ task :validate do
     sh "erb -P -x -T '-' #{template} | ruby -c"
   end
 end
-
-namespace :litmus do
-  def install_remote_gem(gem_name, target_nodes, inventory_hash)
-    # TODO: Currently this is Linux only
-    install_command = "/opt/puppetlabs/puppet/bin/gem install #{gem_name}"
-    result = run_command(install_command, target_nodes, config: nil, inventory: inventory_hash)
-    if result.is_a?(Array)
-      result.each do |node|
-        puts "#{node['target']} failed: '#{node['value']}'" if node['status'] != 'success'
-      end
-    else
-      raise "Failed trying to run '#{install_command}' against inventory."
-    end
-  end
-
-  def install_build_tools(target_nodes, inventory_hash)
-    puts 'Installing build tools...'
-    install_build_command = "yum -y group install 'Development Tools'"
-    result = run_command(install_build_command, target_nodes, config: nil, inventory: inventory_hash)
-    if result.is_a?(Array)
-      result.each do |node|
-        puts "#{node['target']} failed: '#{node['value']}'" if node['status'] != 'success'
-      end
-    else
-      raise "Failed trying to run '#{install_build_command}' against inventory."
-    end
-  end
-
-  # Install the gem under test and required fixture on a collection of nodes
-  #
-  # @param :target_node_name [Array] nodes on which to install a puppet module for testing.
-  desc 'install_gems - build and install module fixtures'
-  task :install_gems, [:target_node_name] do |_task, args|
-    inventory_hash = inventory_hash_from_inventory_file
-    target_nodes = find_targets(inventory_hash, args[:target_node_name])
-    if target_nodes.empty?
-      puts 'No targets found'
-      exit 0
-    end
-    require 'bolt_spec/run'
-    include BoltSpec::Run
-
-    # Build the gem
-    puts 'Building gem...'
-    `gem build puppet-strings.gemspec --quiet`
-    result = $CHILD_STATUS
-    raise "Unable to build the puppet-strings gem. Returned exit code #{result.exitstatus}" unless result.exitstatus.zero?
-
-    # Find the gem build artifact
-    gem_tar = Dir.glob('puppet-strings-*.gem').max_by { |f| File.mtime(f) }
-    raise "Unable to find package in 'puppet-strings-*.gem'" if gem_tar.nil?
-
-    gem_tar = File.expand_path(gem_tar)
-
-    target_string = if args[:target_node_name].nil?
-                      'all'
-                    else
-                      args[:target_node_name]
-                    end
-    puts 'Copying gem to targets...'
-    upload_file(gem_tar, File.basename(gem_tar), target_string, inventory: inventory_hash)
-
-    install_build_tools(target_nodes, inventory_hash)
-
-    # Install dependent gems
-    puts 'Installing yard gem...'
-    install_remote_gem('yard', target_nodes, inventory_hash)
-    puts 'Installing rgen gem...'
-    install_remote_gem('rgen', target_nodes, inventory_hash)
-    # Install puppet-strings
-    puts 'Installing puppet-strings gem...'
-    install_remote_gem(File.basename(gem_tar), target_nodes, inventory_hash)
-    puts 'Installed'
-  end
-end
-
-#### CHANGELOG ####
-begin
-  require 'github_changelog_generator/task'
-  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    require 'puppet-strings/version'
-    config.future_release = "v#{PuppetStrings::VERSION}"
-    config.header = "# Changelog\n\n" \
-      "All significant changes to this repo will be summarized in this file.\n"
-    config.configure_sections = {
-          added: {
-            prefix: "Added",
-            labels: ["enhancement"]
-          },
-          fixed: {
-            prefix: "Fixed",
-            labels: ["bugfix"]
-          },
-          breaking: {
-            prefix: "Changed",
-            labels: ["backwards-incompatible"]
-          }
-        }
-    config.exclude_labels = ['maintenance','incomplete']
-    config.user = 'puppetlabs'
-    config.project = 'puppet-strings'
-  end
-rescue LoadError
-  desc 'Install github_changelog_generator to get access to automatic changelog generation'
-  task :changelog do
-    raise 'Install github_changelog_generator to get access to automatic changelog generation'
-  end
-end
-
-desc 'Run acceptance tests'
-task :acceptance do
-
-  begin
-    if ENV['MATRIX_TARGET']
-      agent_version = ENV['MATRIX_TARGET'].chomp
-    else
-      agent_version = 'puppet7'
-    end
-    
-    Rake::Task['litmus:provision'].invoke('docker', 'litmusimage/centos:7')
-
-    Rake::Task['litmus:install_agent'].invoke(agent_version.to_s)
-
-    Rake::Task['litmus:install_modules_from_directory'].invoke('./spec/fixtures/acceptance/modules')
-
-    Rake::Task['litmus:install_gems'].invoke
-
-    Rake::Task['litmus:acceptance:parallel'].invoke
-
-  rescue StandardError => e
-    puts e.message
-    raise e
-  end
-
-end

Diff for: spec/spec_helper_acceptance_local.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 def sut_module_path(module_regex)
-  modules = JSON.parse(run_shell('puppet module list --render-as json').stdout)
+  modules = JSON.parse(run_shell('bundle exec puppet module list --modulepath spec/fixtures/modules --render-as json').stdout)
   test_module_info = modules['modules_by_path'].values.flatten.find { |mod_info| mod_info =~ module_regex }
   test_module_info.match(%r{\(([^)]*)\)})[1]
 end