summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-12-01 10:07:11 -0800
committerTim Smith <tsmith@chef.io>2017-12-01 10:07:19 -0800
commitf0a37759b58fa222ab3abb7e877c1a4fe03fc217 (patch)
tree247208a91977f7242337f2bfa6e204ff61dec679
parentc673202667724d69a4adbc90f5908de4333f5e44 (diff)
downloadchef-f0a37759b58fa222ab3abb7e877c1a4fe03fc217.tar.gz
Add git and locale cookbooks
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--kitchen-tests/Berksfile.lock8
-rw-r--r--kitchen-tests/cookbooks/base/metadata.rb2
-rw-r--r--kitchen-tests/cookbooks/base/recipes/default.rb4
-rw-r--r--kitchen-tests/cookbooks/base/recipes/packages.rb2
4 files changed, 15 insertions, 1 deletions
diff --git a/kitchen-tests/Berksfile.lock b/kitchen-tests/Berksfile.lock
index 0f41f7bf5e..0d98edf271 100644
--- a/kitchen-tests/Berksfile.lock
+++ b/kitchen-tests/Berksfile.lock
@@ -9,6 +9,9 @@ GRAPH
build-essential (>= 0.0.0)
chef-client (>= 0.0.0)
chef_hostname (>= 0.0.0)
+ cron (>= 0.0.0)
+ git (>= 0.0.0)
+ locale (>= 0.0.0)
logrotate (>= 0.0.0)
multipackage (>= 0.0.0)
nscd (>= 0.0.0)
@@ -29,7 +32,12 @@ GRAPH
chef_hostname (0.6.1)
compat_resource (12.19.0)
cron (5.0.1)
+ git (8.0.0)
+ build-essential (>= 0.0.0)
+ homebrew (>= 0.0.0)
+ homebrew (4.2.0)
iptables (4.3.1)
+ locale (2.0.1)
logrotate (2.2.0)
mingw (2.0.1)
seven_zip (>= 0.0.0)
diff --git a/kitchen-tests/cookbooks/base/metadata.rb b/kitchen-tests/cookbooks/base/metadata.rb
index 4e74e1e0d9..95afa8c030 100644
--- a/kitchen-tests/cookbooks/base/metadata.rb
+++ b/kitchen-tests/cookbooks/base/metadata.rb
@@ -23,6 +23,8 @@ depends "sudo"
depends "ubuntu"
depends "users"
depends "cron"
+depends "git"
+depends "locale"
supports "ubuntu"
supports "debian"
diff --git a/kitchen-tests/cookbooks/base/recipes/default.rb b/kitchen-tests/cookbooks/base/recipes/default.rb
index 176477efc6..a58ec31b1e 100644
--- a/kitchen-tests/cookbooks/base/recipes/default.rb
+++ b/kitchen-tests/cookbooks/base/recipes/default.rb
@@ -55,4 +55,8 @@ include_recipe "logrotate"
include_recipe "cron"
+include_recipe "git"
+
+include_recipe "locale"
+
include_recipe "::tests"
diff --git a/kitchen-tests/cookbooks/base/recipes/packages.rb b/kitchen-tests/cookbooks/base/recipes/packages.rb
index f15d2a55fa..fc65a2d8f7 100644
--- a/kitchen-tests/cookbooks/base/recipes/packages.rb
+++ b/kitchen-tests/cookbooks/base/recipes/packages.rb
@@ -7,7 +7,7 @@
# this is just a list of package that exist on every O/S we test, and often aren't installed by default. you don't
# have to get too clever here, you can delete packages if they don't exist everywhere we test.
-pkgs = %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget subversion git traceroute htop tmux }
+pkgs = %w{lsof tcpdump strace zsh dmidecode ltrace bc curl wget subversion traceroute htop tmux }
# this deliberately calls the multipackage API N times in order to do one package installation in order to exercise the
# multipackage cookbook.