Switch everything to the caching method

Signed-off-by: Tim Smith <tsmith@chef.io>

2 files changed, 6 insertions, 12 deletions

diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index d2e66070..7b8629f5 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -10,35 +10,33 @@ expeditor:
 steps:
 - label: lint-chefstyle
   command:
-    - .expeditor/run_linux_tests.sh style
+    - .expeditor/run_linux_tests.sh "rake style"
   expeditor:
     executor:
       docker:
 
 - label: run-ohai
   command:
-    - .expeditor/run_linux_tests.sh run_ohai
+    - .expeditor/run_linux_tests.sh "bundle exec ohai"
   expeditor:
     executor:
       docker:
 
 - label: run-specs-ruby-2.5
   command:
-    - asdf local ruby 2.5.7
-    - bundle install --jobs=7 --retry=3 --without docs debug
-    - bundle exec rake spec
+    - .expeditor/run_linux_tests.sh rspec
   expeditor:
     executor:
       docker:
+        image: ruby:2.5-buster
 
 - label: run-specs-ruby-2.6
   command:
-    - asdf local ruby 2.6.5
-    - bundle install --jobs=7 --retry=3 --without docs debug
-    - bundle exec rake spec
+    - .expeditor/run_linux_tests.sh rspec
   expeditor:
     executor:
       docker:
+        image: ruby:2.6-buster
 
 - label: run-specs-windows
   command:
diff --git a/Rakefile b/Rakefile
index 785bba74..200737d3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -31,10 +31,6 @@ rescue LoadError
   puts "yard is not available. bundle install first to make sure all dependencies are installed."
 end
 
-task :run_ohai do
-  sh "bin/ohai"
-end
-
 task :console do
   require "irb"
   require "irb/completion"