diff options
author | Matt Wrock <matt@mattwrock.com> | 2016-03-23 11:02:54 -0700 |
---|---|---|
committer | Matt Wrock <matt@mattwrock.com> | 2016-03-23 11:02:54 -0700 |
commit | 37dab57b7c6f218dad43258c745ac57471842505 (patch) | |
tree | e6b906bb44d77a236efdd7eff8314b80ca28fd20 /acceptance | |
parent | e9194179bca12371be27dd2e135abb63199b0c75 (diff) | |
parent | 6d9ecd132eb38ebe34f9925e5f1694aa9d13618f (diff) | |
download | chef-37dab57b7c6f218dad43258c745ac57471842505.tar.gz |
Merge pull request #4735 from chef/arch
Pass windows architecture to kitchen provisioner
Diffstat (limited to 'acceptance')
-rw-r--r-- | acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml b/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml index 46cb1ea970..40228829bb 100644 --- a/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml +++ b/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml @@ -201,6 +201,8 @@ platforms: # Windows # - name: windows-2012r2 + provisioner: + architecture: <%= ENV["KITCHEN_CHEF_WIN_ARCHITECTURE"] %> driver: image_search: name: Windows_Server-2012-R2*-English-*-Base-* |