diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2019-04-19 21:08:57 -0700 |
|---|---|---|
| committer | Bryan McLellan <btm@loftninjas.org> | 2019-05-17 10:01:09 -0400 |
| commit | 0fea8567bb4a2ea2b9191ffce97a8e2449e687f6 (patch) | |
| tree | d38297e0fe643b284f27da2f17d7ff0696200796 | |
| parent | ea1fca6c894295c926b94c652014c9a1be7388fc (diff) | |
| download | chef-0fea8567bb4a2ea2b9191ffce97a8e2449e687f6.tar.gz | |
use lifecycle hooks and kitchen-dokken 2.x
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | kitchen-tests/Gemfile | 4 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.travis.yml | 26 |
2 files changed, 16 insertions, 14 deletions
diff --git a/kitchen-tests/Gemfile b/kitchen-tests/Gemfile index c571298fc2..002dcd3935 100644 --- a/kitchen-tests/Gemfile +++ b/kitchen-tests/Gemfile @@ -4,8 +4,8 @@ gem "rake" # required to build some native extensions gem "chef", path: ".." gem "ohai", git: "https://github.com/chef/ohai.git", branch: "14-stable" # 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", "< 2.0" # 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 "kitchen-vagrant", git: "https://github.com/test-kitchen/kitchen-vagrant.git", branch: "master" gem "test-kitchen", git: "https://github.com/test-kitchen/test-kitchen.git", branch: "master" diff --git a/kitchen-tests/kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml index db9323e4a6..29b03da947 100644 --- a/kitchen-tests/kitchen.travis.yml +++ b/kitchen-tests/kitchen.travis.yml @@ -9,18 +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: "master" - github_access_token: <%= ENV['KITCHEN_GITHUB_TOKEN'] %> - data_path: test/fixtures - chef_license: "accept-no-persist" + 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 |