Merge pull request #842 from puppetlabs/revert-838-revert-836-beaker-hostgenerator/2.1.x

(QENG-3181) Use beaker-hostgenerator instead of sqa-utils

Author: KevinCorcoran

Gemfile

@@ -16,9 +16,7 @@ gem 'jira-ruby', :group => :development
 group :test do
   gem 'rspec'
   gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '~> 2.14.0')
-  if ENV['GEM_SOURCE'] =~ /rubygems\.delivery\.puppetlabs\.net/
-    gem 'sqa-utils', '0.13.3'
-  end
+  gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'] || "~> 0.2")
   gem 'httparty'
   gem 'uuidtools'
 end

acceptance/README.md

@@ -34,14 +34,15 @@ Copy/modify the local RHEL-7 host config at
 basic 2-node configuration.
 
 Please note, the most recent host configurations can be generated with the
-`genconfig` command available from the `sqa-utils` gem.  Generating a new host
-configuration takes the form of `bundle exec genconfig redhat7-64ma`
+`beaker-hostgenerator` command available from the `beaker-hostgenerator` gem.
+Generating a new host configuration takes the form of `bundle exec
+beaker-hostgenerator redhat7-64ma`
 
 The host expression is a bit strange and is parsed as per the documentation at
-`bundle exec genconfig --help`.  See also [the
-source][genconfig].
+`bundle exec beaker-hostgenerator --help`.  See also [the
+source][beaker-hostgenerator].
 
-[genconfig]: https://github.com/puppetlabs/sqa-utils-gem/blob/76d8dbc/lib/genconfig/cli.rb#L20-L47
+[beaker-hostgenerator]: https://github.com/puppetlabs/beaker-hostgenerator
 
 #### Define the PACKAGE_BUILD_VERSION and PUPPET_VERSION environment variables
 

acceptance/scripts/generic/testrun.sh

@@ -14,7 +14,7 @@ export BEAKER_HELPER="acceptance/lib/helper.rb"
 
 bundle install --path vendor/bundle
 
-bundle exec genconfig2 $GENCONFIG_LAYOUT > $BEAKER_CONFIG
+bundle exec beaker-hostgenerator $GENCONFIG_LAYOUT > $BEAKER_CONFIG
 
 bundle exec beaker \
   --config $BEAKER_CONFIG \