summaryrefslogtreecommitdiff
path: root/kitchen-tests
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2021-03-18 10:26:11 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2021-03-18 10:35:51 -0700
commit2d88d96b2cfeabd9eaa5350a1f8b90e54632923c (patch)
tree5c86b235c9a011fdb5993f34ca91df3fedddea04 /kitchen-tests
parent12265fccc388abe416d89e1f06df546d6b024747 (diff)
downloadchef-2d88d96b2cfeabd9eaa5350a1f8b90e54632923c.tar.gz
ruby 3.0 fixes and post-bundle-install hook
Mostly this is all fixes necessary for ruby 3.0 There's the addition of the appbundle hook which lets us better pull git gems into appbundler Note carefully how after adding the post-bundle-install.rb that trying to pre appbundle-update ohai pulls in chef/chef as bundle installed git gem which fails to install so we go back to only using one appbundle-update on chef/chef and removing the chef/ohai one (which may fix other bugs). Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'kitchen-tests')
-rw-r--r--kitchen-tests/kitchen.yml6
1 files changed, 0 insertions, 6 deletions
diff --git a/kitchen-tests/kitchen.yml b/kitchen-tests/kitchen.yml
index 8e894c4699..9c3a3a36cf 100644
--- a/kitchen-tests/kitchen.yml
+++ b/kitchen-tests/kitchen.yml
@@ -21,15 +21,9 @@ lifecycle:
- remote: /opt/chef/bin/chef-client -v
- remote: /opt/chef/bin/ohai -v
- remote: /opt/chef/embedded/bin/gem install appbundler appbundle-updater --no-doc
- - remote: scl enable devtoolset-8 '/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'
- includes:
- - centos-6
- remote: scl enable devtoolset-8 '/opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['BUILDKITE_COMMIT'] || %x(git rev-parse HEAD).chomp %> --tarball --github chef/chef'
includes:
- centos-6
- - 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
- excludes:
- - centos-6
- remote: /opt/chef/embedded/bin/appbundle-updater chef chef <%= ENV['BUILDKITE_COMMIT'] || %x(git rev-parse HEAD).chomp %> --tarball --github chef/chef
excludes:
- centos-6