From dd15133b84e176d3775168a892c6f5388b73025a Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith84@gmail.com>
Date: Mon, 15 Mar 2021 11:20:45 -0700
Subject: Test on Ruby 3 and update gem caching

Cache all our gem installs using Buildkite

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 .expeditor/run_linux_tests.sh  | 40 +---------------------------------------
 .expeditor/verify.pipeline.yml | 22 +++++++++++++++++-----
 2 files changed, 18 insertions(+), 44 deletions(-)

diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh
index 4c14c80..fc2f6b2 100755
--- a/.expeditor/run_linux_tests.sh
+++ b/.expeditor/run_linux_tests.sh
@@ -5,49 +5,11 @@
 set -ue
 
 export USER="root"
-
-echo "--- dependencies"
 export LANG=C.UTF-8 LANGUAGE=C.UTF-8
-S3_URL="s3://public-cd-buildkite-cache/${BUILDKITE_PIPELINE_SLUG}/${BUILDKITE_LABEL}"
-
-pull_s3_file() {
-    aws s3 cp "${S3_URL}/$1" "$1" || echo "Could not pull $1 from S3"
-}
-
-push_s3_file() {
-    if [ -f "$1" ]; then
-        aws s3 cp "$1" "${S3_URL}/$1" || echo "Could not push $1 to S3 for caching."
-    fi
-}
-
-apt-get update -y
-apt-get install awscli -y
 
 echo "--- bundle install"
-pull_s3_file "bundle.tar.gz"
-pull_s3_file "bundle.sha256"
-
-if [ -f bundle.tar.gz ]; then
-  tar -xzf bundle.tar.gz
-fi
-
-if [ -n "${RESET_BUNDLE_CACHE:-}" ]; then
-    rm bundle.sha256
-fi
-
 bundle config --local path vendor/bundle
 bundle install --jobs=7 --retry=3
 
-echo "--- bundle cache"
-if test -f bundle.sha256 && shasum --check bundle.sha256 --status; then
-    echo "Bundled gems have not changed. Skipping upload to s3"
-else
-    echo "Bundled gems have changed. Uploading to s3"
-    shasum -a 256 Gemfile.lock > bundle.sha256
-    tar -czf bundle.tar.gz vendor/
-    push_s3_file bundle.tar.gz
-    push_s3_file bundle.sha256
-fi
-
 echo "+++ bundle exec task"
-bundle exec $1
+bundle exec $@
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 855a197..165dccc 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -1,12 +1,14 @@
 ---
 expeditor:
+  cached_folders:
+    - vendor
   defaults:
     buildkite:
       timeout_in_minutes: 30
 
 steps:
 
-- label: run-lint-and-specs-ruby-2.4
+- label: run-lint-and-specs-:ruby:-2.4
   command:
     - .expeditor/run_linux_tests.sh rake
   expeditor:
@@ -14,7 +16,7 @@ steps:
       docker:
         image: ruby:2.4-buster
 
-- label: run-lint-and-specs-ruby-2.5
+- label: run-lint-and-specs-:ruby:-2.5
   command:
     - .expeditor/run_linux_tests.sh rake
   expeditor:
@@ -22,14 +24,15 @@ steps:
       docker:
         image: ruby:2.5-buster
 
-- label: run-lint-and-specs-ruby-2.6
+- label: run-lint-and-specs-:ruby:-2.6
   command:
     - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
         image: ruby:2.6-buster
-- label: run-lint-and-specs-ruby-2.7
+
+- label: run-lint-and-specs-:ruby:-2.7
   command:
     - .expeditor/run_linux_tests.sh rake
   expeditor:
@@ -37,9 +40,18 @@ steps:
       docker:
         image: ruby:2.7-buster
 
+- label: run-lint-and-specs-:ruby:-3.0
+  command:
+    - .expeditor/run_linux_tests.sh rake
+  expeditor:
+    executor:
+      docker:
+        image: ruby:3.0-buster
+
 - label: run-specs-windows
   command:
-    - bundle install --jobs=7 --retry=3 --without docs debug
+    - bundle config --local path vendor/bundle
+    - bundle install --jobs=7 --retry=3
     - bundle exec rake
   expeditor:
     executor:
-- 
cgit v1.2.1