kienan
/
puppet-strings
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(PDOC-144) acceptance: fix windows pre-suite 

* windows install requires type=aio so gem_command can find the right gem exe
* this change also allows easier command line use
  * by using a sensible default for the acceptance key

[skip ci]
This commit is contained in:
Eric Thompson 2017-02-07 00:32:58 +00:00
parent 5682ffa915
commit 5908cc795d
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Rakefile
View File

@ -21,12 +21,17 @@ end
task :acceptance do task :acceptance do
require 'beaker-hostgenerator' require 'beaker-hostgenerator'
install_type = 'aio'
target = ENV['platform'] target = ENV['platform']
unless target =~ /type=/
puts "INFO: adding 'type=#{install_type}' to host config"
target += "{type=#{install_type}}"
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".'
target = 'centos7-64ma' target = "centos7-64ma{type=#{install_type}}"
ENV['platform'] = target
end end
cli = BeakerHostGenerator::CLI.new([target]) cli = BeakerHostGenerator::CLI.new([target])
@ -36,10 +41,15 @@ task :acceptance do
File.open(nodeset, 'w') do |fh| File.open(nodeset, 'w') do |fh|
fh.print(cli.execute) fh.print(cli.execute)
end end
puts "nodeset file:"
puts nodeset puts nodeset
sh 'gem build puppet-strings.gemspec' sh 'gem build puppet-strings.gemspec'
sh 'puppet module build spec/fixtures/acceptance/modules/test' sh 'puppet module build spec/fixtures/acceptance/modules/test'
sh "BEAKER_set=#{ENV['platform']} rspec spec/acceptance/*.rb" if ENV['BEAKER_keyfile']
sh "BEAKER_set=#{target} rspec spec/acceptance/*.rb"
else
sh "BEAKER_keyfile=$HOME/.ssh/id_rsa-acceptance BEAKER_set=#{target} rspec spec/acceptance/*.rb"
end
end end
task(:rubocop) do task(:rubocop) do