Run tests on the modern container setup

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

2 files changed, 64 insertions, 39 deletions

diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh
new file mode 100755
index 00000000..7df19364
--- /dev/null
+++ b/.expeditor/run_linux_tests.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# This script runs a passed in command, but first setups up the bundler caching on the repo
+
+set -ue
+
+export USER="root"
+export LANG=C.UTF-8 LANGUAGE=C.UTF-8
+
+echo "--- bundle install"
+
+bundle config --local path vendor/bundle
+bundle install --jobs=7 --retry=3
+
+echo "+++ bundle exec task"
+bundle exec $@
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 35f2feb8..aafb0222 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -1,44 +1,53 @@
-steps:
-
-- label: lint-chefstyle
-  command:
-    - bundle install --jobs=7 --retry=3 --without docs debug
-    - bundle exec rake style
+---
   expeditor:
-    executor:
-      docker:
+    cached_folders:
+      - vendor
+    defaults:
+      buildkite:
+        retry:
+          automatic:
+            limit: 1
+        timeout_in_minutes: 30
 
-- label: run-ohai
-  command:
-    - bundle install --jobs=7 --retry=3 --without docs debug
-    - bundle exec ohai
-  expeditor:
-    executor:
-      docker:
+  steps:
+  - label: lint-chefstyle
+    command:
+      - .expeditor/run_linux_tests.sh "rake style"
+    expeditor:
+      executor:
+        docker:
+          image: ruby:2.6-buster
 
-- label: run-specs-ruby-2.5
-  command:
-    - asdf local ruby 2.5.5
-    - bundle install --jobs=7 --retry=3 --without docs debug
-    - bundle exec rake spec
-  expeditor:
-    executor:
-      docker:
+  - label: run-ohai
+    command:
+      - .expeditor/run_linux_tests.sh "bundle exec ohai"
+    expeditor:
+      executor:
+        docker:
+          image: ruby:2.6-buster
 
-- label: run-specs-ruby-2.6
-  command:
-    - asdf local ruby 2.6.3
-    - bundle install --jobs=7 --retry=3 --without docs debug
-    - bundle exec rake spec
-  expeditor:
-    executor:
-      docker:
+  - label: run-specs-ruby-2.5
+    command:
+      - .expeditor/run_linux_tests.sh rspec
+    expeditor:
+      executor:
+        docker:
+          image: ruby:2.5-buster
 
-- label: run-specs-windows
-  command:
-    - bundle install --jobs=7 --retry=3 --without docs debug
-    - bundle exec rake spec
-  expeditor:
-    executor:
-      docker:
-        host_os: windows
+  - label: run-specs-ruby-2.6
+    command:
+      - .expeditor/run_linux_tests.sh rspec
+    expeditor:
+      executor:
+        docker:
+          image: ruby:2.6-buster
+
+  - label: run-specs-windows
+    command:
+      - bundle config --local path vendor/bundle
+      - bundle install --jobs=7 --retry=3
+      - bundle exec rake spec
+    expeditor:
+      executor:
+        docker:
+          host_os: windows