diff options
| author | John Keiser <john@johnkeiser.com> | 2016-02-29 10:07:38 -0800 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-02-29 10:07:38 -0800 |
| commit | dd1427893c5656600465ced2da06db76879edc0a (patch) | |
| tree | caee0512ec523f2d1163e7044fc03dad2a266477 /acceptance | |
| parent | be1438e82d3fc6dfd85eaf24402283dec765de32 (diff) | |
| download | chef-dd1427893c5656600465ced2da06db76879edc0a.tar.gz | |
Add ability to run tests against chefdkjk/work-with-chefdk-too
Diffstat (limited to 'acceptance')
3 files changed, 18 insertions, 0 deletions
diff --git a/acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml b/acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml index 50558c3d39..d49d4b9cf0 100644 --- a/acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml +++ b/acceptance/.shared/kitchen_acceptance/.kitchen.digitalocean.yml @@ -15,6 +15,12 @@ provisioner: product_version: latest channel: current +# busser installation relies on this +<% if ENV["KITCHEN_CHEF_PRODUCT"] %> +verifier: + chef_omnibus_root: "/opt/<%= ENV["KITCHEN_CHEF_PRODUCT"] %>" +<% end %> + platforms: <% %w(centos-6.5 centos-7.0 fedora-21 diff --git a/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml b/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml index 36c72f1579..190b4ad6e3 100644 --- a/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml +++ b/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml @@ -20,6 +20,12 @@ driver: instance_type: m3.large # associate_public_ip: true # Don't enable public IP, as subnet specified is behind VPN +# busser installation relies on this +<% if ENV["KITCHEN_CHEF_PRODUCT"] %> +verifier: + chef_omnibus_root: "/opt/<%= ENV["KITCHEN_CHEF_PRODUCT"] %>" +<% end %> + transport: ssh_key: <%= file_if_exists("~/.ssh/#{ENV['AWS_SSH_KEY_ID'] || ENV['USER'] || ENV['USERNAME']}.pem") || file_if_exists("~/.ssh/#{ENV['AWS_SSH_KEY_ID'] || ENV['USER'] || ENV['USERNAME']}") || diff --git a/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml b/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml index 1d6c7fc037..954f5e9eb1 100644 --- a/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml +++ b/acceptance/.shared/kitchen_acceptance/.kitchen.vagrant.yml @@ -16,6 +16,12 @@ provisioner: chef_acceptance: "true" use_system_chef: "true" +# busser installation relies on this +<% if ENV["KITCHEN_CHEF_PRODUCT"] %> +verifier: + chef_omnibus_root: "/opt/<%= ENV["KITCHEN_CHEF_PRODUCT"] %>" +<% end %> + platforms: <% %w( debian-8 |