summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-04-20 12:29:58 -0700
committerBryan McLellan <btm@loftninjas.org>2019-05-17 10:38:24 -0400
commit8638b760d887e6475f6412ec6010910445707126 (patch)
tree60d7f001ecc487cea455e9c20a38b4814bb35bd1
parentd6015b9044bc0b5761e2b72c3d7a78734a11f00c (diff)
downloadchef-8638b760d887e6475f6412ec6010910445707126.tar.gz
cruft cleanup
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--kitchen-tests/kitchen.travis.yml14
1 files changed, 3 insertions, 11 deletions
diff --git a/kitchen-tests/kitchen.travis.yml b/kitchen-tests/kitchen.travis.yml
index 019bc72ebb..e387e6774b 100644
--- a/kitchen-tests/kitchen.travis.yml
+++ b/kitchen-tests/kitchen.travis.yml
@@ -10,22 +10,14 @@ transport:
provisioner:
name: dokken
- # require_chef_omnibus: latest
- # chef_omnibus_url: "https://omnitruck.chef.io/install.sh"
- # chef_omnibus_install_options: "-c current"
-
+ 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 chef <%= ENV['TRAVIS_COMMIT'] %> --tarball --github chef/chef
- 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
-
-# github_access_token: <%= ENV['KITCHEN_GITHUB_TOKEN'] %>
-
-# disable file provider diffs so we don't overflow travis' line limit
- client_rb:
- diff_disabled: true
+ - remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['TRAVIS_COMMIT'] %> --tarball --github chef/chef
verifier:
name: inspec