Merge "Pin test kitchen to chef 13.6.4"

This commit is contained in:
Zuul 2018-02-14 17:12:28 +00:00 committed by Gerrit Code Review
commit ef7b71b861
3 changed files with 3 additions and 3 deletions

View File

@ -2,7 +2,7 @@
driver:
name: dokken
privileged: true
chef_version: current
chef_version: '13.6.4' # workaround for chef/chef#6784
volumes:
- /sys/fs/cgroup:/sys/fs/cgroup:ro
- /sys/fs/selinux:/sys/fs/selinux:rw

View File

@ -13,7 +13,7 @@ provisioner:
# For example:
# always_update_cookbooks: <%= !ENV['CI'] %>
always_update_cookbooks: true
require_chef_omnibus: 13
require_chef_omnibus: '13.6.4' # workaround for chef/chef#6784
# Copy secret to /tmp/kitchen on test VM. Kitchen tries to gather secrets
# before any recipes had a chance to run -> we cannot use a recipe to put the
# secrets file in place.

View File

@ -15,7 +15,7 @@ provisioner:
# For example:
# always_update_cookbooks: <%= !ENV['CI'] %>
always_update_cookbooks: true
require_chef_omnibus: 13
require_chef_omnibus: '13.6.4' # workaround for chef/chef#6784
# Copy secret to /tmp/kitchen on test VM. Kitchen tries to gather secrets
# before any recipes had a chance to run -> we cannot use a recipe to put the
# secrets file in place.