beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11793 from jbonhag/e/guest-platform

Browse Source 
Pass guest platform into spec runner
This commit is contained in:
Chris Roberts 2020-08-07 10:54:38 -07:00 committed by GitHub
commit 75253b41bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/vagrant-spec/Vagrantfile.spec
View File

@ -85,6 +85,8 @@ Vagrant.configure(2) do |global_config|
end
guest_boxes.each_with_index do |box_info, idx|
guest_box, box_version = box_info
guest_platform = guest_box.split('/').last.sub(/[^a-z]+$/, '')
guest_platform = PLATFORM_SCRIPT_MAPPING[guest_platform]
spec_cmd_args = ENV["VAGRANT_SPEC_ARGS"]
if idx != 0
spec_cmd_args = "#{spec_cmd_args} --without-component cli/*".strip
@ -96,7 +98,8 @@ Vagrant.configure(2) do |global_config|
keep_color: true,
env: {
"VAGRANT_SPEC_ARGS" => "--no-builtin #{spec_cmd_args}".strip,
"VAGRANT_SPEC_BOX" => "c:/vagrant/#{guest_box.sub('/', '_')}.#{provider_name}.#{box_version}.box"
"VAGRANT_SPEC_BOX" => "c:/vagrant/#{guest_box.sub('/', '_')}.#{provider_name}.#{box_version}.box",
"VAGRANT_SPEC_GUEST_PLATFORM" => guest_platform
}
)
else
@ -106,7 +109,8 @@ Vagrant.configure(2) do |global_config|
keep_color: true,
env: {
"VAGRANT_SPEC_ARGS" => "--no-builtin #{spec_cmd_args}".strip,
"VAGRANT_SPEC_BOX" => "/vagrant/test/vagrant-spec/boxes/#{guest_box.sub('/', '_')}.#{provider_name}.#{box_version}.box"
"VAGRANT_SPEC_BOX" => "/vagrant/test/vagrant-spec/boxes/#{guest_box.sub('/', '_')}.#{provider_name}.#{box_version}.box",
"VAGRANT_SPEC_GUEST_PLATFORM" => guest_platform
}
)
end