Merge pull request #146 from smcelmurry/qeng-5344
(QENG-5344) Add beaker-abs for CI.next-i-fication
This commit is contained in:
commit
99efcb156a
|
@ -8,6 +8,9 @@ bundler_args: --without development acceptance
|
||||||
notifications:
|
notifications:
|
||||||
email: false
|
email: false
|
||||||
|
|
||||||
|
before_install:
|
||||||
|
- gem update bundler
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
include:
|
include:
|
||||||
|
|
1
Gemfile
1
Gemfile
|
@ -23,6 +23,7 @@ group :acceptance do
|
||||||
gem 'beaker', '< 3.0'
|
gem 'beaker', '< 3.0'
|
||||||
gem 'beaker-rspec'
|
gem 'beaker-rspec'
|
||||||
gem 'beaker-hostgenerator'
|
gem 'beaker-hostgenerator'
|
||||||
|
gem 'beaker-abs'
|
||||||
end
|
end
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
|
|
3
Rakefile
3
Rakefile
|
@ -23,6 +23,7 @@ task :acceptance do
|
||||||
|
|
||||||
install_type = 'aio'
|
install_type = 'aio'
|
||||||
target = ENV['platform']
|
target = ENV['platform']
|
||||||
|
abs = if ENV['BEAKER_ABS'] then 'abs' else 'vmpooler' end
|
||||||
if ! target
|
if ! target
|
||||||
STDERR.puts 'TEST_TARGET environment variable is not set'
|
STDERR.puts 'TEST_TARGET environment variable is not set'
|
||||||
STDERR.puts 'setting to default value of "centos7-64ma".'
|
STDERR.puts 'setting to default value of "centos7-64ma".'
|
||||||
|
@ -34,7 +35,7 @@ task :acceptance do
|
||||||
target += "{type=#{install_type}}"
|
target += "{type=#{install_type}}"
|
||||||
end
|
end
|
||||||
|
|
||||||
cli = BeakerHostGenerator::CLI.new([target])
|
cli = BeakerHostGenerator::CLI.new([target, '--hypervisor', abs])
|
||||||
nodeset_dir = 'spec/acceptance/nodesets'
|
nodeset_dir = 'spec/acceptance/nodesets'
|
||||||
nodeset = "#{nodeset_dir}/#{target}.yml"
|
nodeset = "#{nodeset_dir}/#{target}.yml"
|
||||||
FileUtils.mkdir_p(nodeset_dir)
|
FileUtils.mkdir_p(nodeset_dir)
|
||||||
|
|
Loading…
Reference in New Issue