Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 31, 2015
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions acceptance/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion acceptance/scripts/generic/testrun.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down