diff options
| author | Tim Smith <tsmith@chef.io> | 2019-04-22 10:26:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-22 10:26:38 -0700 |
| commit | 96e71f2d2fc0b84cd06a77a89f88dc236add430a (patch) | |
| tree | e2207420e9479e2a3f4f7a01c1d8605e38e41584 | |
| parent | 19268c5d5f611198a048d0b0bce756e378a88fb6 (diff) | |
| parent | 52721e4d99e37888a2bc92b735bcf310d44198f6 (diff) | |
| download | chef-96e71f2d2fc0b84cd06a77a89f88dc236add430a.tar.gz | |
Merge pull request #8403 from chef/lcg/use-lifecycle-hooks
use lifecycle hooks and kitchen-dokken 2.x
| -rw-r--r-- | kitchen-tests/Gemfile | 3 | ||||
| -rw-r--r-- | kitchen-tests/kitchen.travis.yml | 19 |
2 files changed, 8 insertions, 14 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..5723e13ffd 100644 --- a/kitchen-tests/kitchen.travis.yml +++ b/kitchen-tests/kitchen.travis.yml @@ -9,21 +9,16 @@ 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 -# disable file provider diffs so we don't overflow travis' line limit + name: dokken client_rb: diff_disabled: true +lifecycle: + pre_converge: + - remote: /opt/chef/embedded/bin/gem install 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 + verifier: name: inspec format: progress |