Skip to content

Commit

Permalink
Merge branch 'issue/flanders/pe-19049-add-meep-classification-feature…
Browse files Browse the repository at this point in the history
…-flag' into pe-modules-next

* issue/flanders/pe-19049-add-meep-classification-feature-flag:
  (PE-19831) Remove pe_repo classes from meep classification
  (PE-19438) Mock `scp_from` for `do_install`
  (PE-19438) Move pe.conf setup into descriptive function
  (PE-19438) Stop passing -c to upgrades from MEEP
  (PE-19049) Remove get_console_dispatcher_for_beaker_pe specs
  (PE-19049) use_meep_for_classification for configure_puppet_agent_service
  (PE-19049) Add helper method to read a hocon key from pe.conf
  (PE-19049) Add method to create or update a meep node.conf file
  (PE-19049) Can remove parameters from pe.conf
  (PE-19049,PE-11353) Ensure puppet service is stopped in 2017.1+ builds
  (maint) Use a Beaker::Host instance when mocking hosts
  (PE-19049) Modify how we obtain console dispatcher for frictionless
  (maint) Require beaker directly in spec_helper
  (PE-19049,PE-18718,PE-18799) Provide a test method for meep classification
  (maint) Remove unused variables
  • Loading branch information
jpartlow committed Mar 16, 2017
2 parents f22ac7f + b2b3d9d commit f9b3ecd
Show file tree
Hide file tree
Showing 10 changed files with 611 additions and 49 deletions.
4 changes: 0 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ source ENV['GEM_SOURCE'] || "https://rubygems.org"

gemspec



def location_for(place, fake_version = nil)
if place =~ /^(git:[^#]*)#(.*)/
[fake_version, { :git => $1, :branch => $2, :require => false }].compact
Expand All @@ -14,7 +12,6 @@ def location_for(place, fake_version = nil)
end
end


# We don't put beaker in as a test dependency because we
# don't want to create a transitive dependency
group :acceptance_testing do
Expand All @@ -25,7 +22,6 @@ if ENV['GEM_SOURCE'] =~ /rubygems\.delivery\.puppetlabs\.net/
gem "scooter", *location_for(ENV['SCOOTER_VERSION'] || '~> 3.0')
end


if File.exists? "#{__FILE__}.local"
eval(File.read("#{__FILE__}.local"), binding)
end
1 change: 0 additions & 1 deletion lib/beaker-pe.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module PE
end
end


# Boilerplate DSL inclusion mechanism:
# First we register our module with the Beaker DSL
Beaker::DSL.register( Beaker::DSL::PE )
Expand Down
306 changes: 291 additions & 15 deletions lib/beaker-pe/install/pe_utils.rb

Large diffs are not rendered by default.

Loading

0 comments on commit f9b3ecd

Please sign in to comment.