diff options
| author | John Keiser <john@johnkeiser.com> | 2016-01-25 12:37:46 -0800 |
|---|---|---|
| committer | John Keiser <john@johnkeiser.com> | 2016-01-26 09:44:20 -0800 |
| commit | 5a41029c3711eb8b6fb9106f16ee630e5fbb46a7 (patch) | |
| tree | 41dd20946aafde6c53efd3432c2510fad25f8e23 | |
| parent | c7758ccfa08a02c40561ac0cb683cefbf8bcab42 (diff) | |
| download | chef-5a41029c3711eb8b6fb9106f16ee630e5fbb46a7.tar.gz | |
Review comments
4 files changed, 8 insertions, 1 deletions
diff --git a/acceptance/cookbook-git/.acceptance/acceptance-cookbook/libraries/init.rb b/acceptance/cookbook-git/.acceptance/acceptance-cookbook/libraries/init.rb index be84b88a0a..d40d6672e7 100644 --- a/acceptance/cookbook-git/.acceptance/acceptance-cookbook/libraries/init.rb +++ b/acceptance/cookbook-git/.acceptance/acceptance-cookbook/libraries/init.rb @@ -2,12 +2,15 @@ module CookbookGit def self.test_cookbook_name "git" end + def self.test_run_path File.join(Chef.node["chef-acceptance"]["suite-dir"], "test_run") end + def self.acceptance_path File.expand_path("..", Chef.node["chef-acceptance"]["suite-dir"]) end + def self.acceptance_gemfile File.join(acceptance_path, "Gemfile") end diff --git a/acceptance/cookbook-git/.acceptance/acceptance-cookbook/recipes/provision.rb b/acceptance/cookbook-git/.acceptance/acceptance-cookbook/recipes/provision.rb index b5efb93c57..878de27f54 100644 --- a/acceptance/cookbook-git/.acceptance/acceptance-cookbook/recipes/provision.rb +++ b/acceptance/cookbook-git/.acceptance/acceptance-cookbook/recipes/provision.rb @@ -1,5 +1,6 @@ # Grab the cookbook directory CookbookGit.test_run_path + # TODO Grab the source URL from supermarket # TODO get git to include its kitchen tests in the cookbook. git "#{CookbookGit.test_run_path}/#{CookbookGit.test_cookbook_name}" do diff --git a/acceptance/cookbook-git/.kitchen.digitalocean.yml b/acceptance/cookbook-git/.kitchen.digitalocean.yml index 744fb3d799..29733210c7 100644 --- a/acceptance/cookbook-git/.kitchen.digitalocean.yml +++ b/acceptance/cookbook-git/.kitchen.digitalocean.yml @@ -1,3 +1,5 @@ +# Not quite ready yet + driver: name: digitalocean digitalocean_access_token: <%= ENV['DIGITALOCEAN_API_TOKEN'] %> diff --git a/acceptance/cookbook-git/.kitchen.ec2.yml b/acceptance/cookbook-git/.kitchen.ec2.yml index b9a20bf2f2..adfd108383 100644 --- a/acceptance/cookbook-git/.kitchen.ec2.yml +++ b/acceptance/cookbook-git/.kitchen.ec2.yml @@ -1,4 +1,4 @@ -# chef-acceptance test --platform=ubuntu +# Not quite ready yet <% def file_if_exists(path) @@ -22,6 +22,7 @@ driver: subnet_id: subnet-19ac017c security_group_ids: ["sg-e401eb83", "sg-96274af3"] instance_type: m3.large + associate_public_ip: true platforms: # |