summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-04-19 21:08:57 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2019-04-19 21:10:00 -0700
commitbe0c896d5622687034caa9ea263066394f2d7003 (patch)
tree5a41868dea235d54b9dc553272f5066eead0748b /kitchen-tests
parentf1a97f33d4b67645ed55ce6e15274d6adf396670 (diff)
downloadchef-be0c896d5622687034caa9ea263066394f2d7003.tar.gz
use lifecycle hooks and kitchen-dokken 2.x
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/Gemfile3
-rw-r--r--kitchen-tests/kitchen.travis.yml25
2 files changed, 15 insertions, 13 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile
index 6c541af6a7..fc01f7dded 100644
--- a/kitchen-tests/Gemfile
+++ b/kitchen-tests/Gemfile
@@ -4,8 +4,7 @@ gem "rake" # required to build some native extensions
gem "chef", path: ".."
gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master" # avoids failures when we bump chef major
gem "berkshelf", git: "https://github.com/berkshelf/berkshelf.git", branch: "master"
-gem "kitchen-appbundle-updater"
-gem "kitchen-dokken", "=1.1.1" # 2.x fails atm: https://travis-ci.org/chef/chef/jobs/199125787
+gem "kitchen-dokken", "~> 2.0"
gem "kitchen-docker", git: "https://github.com/test-kitchen/kitchen-docker.git", branch: "master"
gem "kitchen-inspec", git: "https://github.com/chef/kitchen-inspec.git", branch: "master"
gem "inspec", git: "https://github.com/inspec/inspec.git", branch: "master" # this goes away when we ship inspec 4
diff --git a/kitchen-tests/kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml
index f445f5a36e..aee77fd6f8 100644
--- a/kitchen-tests/kitchen.travis.yml
+++ b/kitchen-tests/kitchen.travis.yml
@@ -9,17 +9,20 @@ transport:
name: dokken
provisioner:
- name: chef_github
- root_path: /opt/kitchen
- require_chef_omnibus: latest
- chef_omnibus_url: "https://omnitruck.chef.io/install.sh"
- chef_omnibus_install_options: "-c current"
- github_owner: "chef"
- github_repo: "chef"
- refname: <%= ENV['TRAVIS_COMMIT'] %>
- ohai_refname: "<%= File.readlines('../Gemfile.lock', File.expand_path(File.dirname(__FILE__))).find { |l| l =~ /^\s+ohai \((\d+\.\d+\.\d+)\)/ }; 'v' + $1 %>"
- github_access_token: <%= ENV['KITCHEN_GITHUB_TOKEN'] %>
- data_path: test/fixtures
+ name: dokken
+ # require_chef_omnibus: latest
+ # chef_omnibus_url: "https://omnitruck.chef.io/install.sh"
+ # chef_omnibus_install_options: "-c current"
+
+
+lifecycle:
+ pre_converge:
+ - remote: /opt/chef/embedded/bin/gem install appbundle-updater
+ - remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['TRAVIS_COMMIT'] %>
+ - 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 %>
+
+# github_access_token: <%= ENV['KITCHEN_GITHUB_TOKEN'] %>
+
# disable file provider diffs so we don't overflow travis' line limit
client_rb:
diff_disabled: true