Skip to content

Commit

Permalink
[dd-handler] Loosen constraint on chef_handler dep (#414)
Browse files Browse the repository at this point in the history
2.x versions are known to work with this cookbook

Also, adds the `dd-handler` recipe to CircleCI test suites.
  • Loading branch information
olivielpeau committed Mar 22, 2017
1 parent 2828883 commit 05ba57d
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 3 deletions.
10 changes: 10 additions & 0 deletions .kitchen.docker.yml
Expand Up @@ -12,3 +12,13 @@ platforms:
- name: centos-6.6
- name: centos-5.11
- name: debian-7.7

suites:
- name: dd-agent-handler
run_list:
- recipe[datadog::dd-handler]
- recipe[datadog::dd-agent]
attributes:
datadog:
api_key: somethingnotnil
application_key: alsonotnil
4 changes: 2 additions & 2 deletions Rakefile
Expand Up @@ -102,8 +102,8 @@ task :circle do
# TODO: This could likely be pulled from kitchen_config.instances somehow
name = platform.name.delete('.')

# Scope the suites to only execute against the Agent installer suites.
commands.push "kitchen verify dd-agent-#{name}"
# Execute a suite that installs the handler and the Agent.
commands.push "kitchen verify dd-agent-handler-#{name}"
end

commands.join(' && ')
Expand Down
2 changes: 1 addition & 1 deletion metadata.rb
Expand Up @@ -22,7 +22,7 @@
end

depends 'apt' # We recommend '>= 2.1.0'. See CHANGELOG.md for details
depends 'chef_handler', '~> 1.1' # We recommend '~> 1.3' with Chef < 12. See CHANGELOG.md for details
depends 'chef_handler', '>= 1.1' # We recommend '~> 1.3' with Chef < 12. See CHANGELOG.md for details
depends 'windows', '< 3.0' # We recommend '< 1.39.0' if running Chef >= 12.6. See README.md for details
depends 'yum', '>= 3.0' # Use '~> 3.0' with Chef < 12

Expand Down

0 comments on commit 05ba57d

Please sign in to comment.