summaryrefslogtreecommitdiff
path: root/kitchen-tests/kitchen.yml
diff options
context:
space:
mode:
Diffstat (limited to 'kitchen-tests/kitchen.yml')
-rw-r--r--kitchen-tests/kitchen.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 5723e13ffd..dbbcd81c1f 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -15,9 +15,15 @@ provisioner:
lifecycle:
pre_converge:
- - remote: /opt/chef/embedded/bin/gem install appbundle-updater
+ - remote: echo "Chef container's Chef / Ohai release:"
+ - remote: /opt/chef/embedded/bin/chef-client -v
+ - remote: /opt/chef/embedded/bin/ohai -v
+ - remote: /opt/chef/embedded/bin/gem install appbundler appbundle-updater
- remote: /opt/chef/embedded/bin/appbundle-updater chef ohai <%= File.readlines('../Gemfile.lock', File.expand_path(File.dirname(__FILE__))).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; 'v' + $1 %> --tarball --github chef/ohai
- - remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['TRAVIS_COMMIT'] %> --tarball --github chef/chef
+ - remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['TRAVIS_COMMIT'] || %x(git rev-parse HEAD).chomp %> --tarball --github chef/chef
+ - remote: echo "Installed Chef / Ohai release:"
+ - remote: /opt/chef/embedded/bin/chef-client -v
+ - remote: /opt/chef/embedded/bin/ohai -v
verifier:
name: inspec