From d2cf2a9c74b43d9d8099364c01525546ac67cc87 Mon Sep 17 00:00:00 2001
From: Tim Smith <tsmith84@gmail.com>
Date: Thu, 19 Dec 2019 13:26:56 -0800
Subject: Test on Ruby 2.7 + random testing improvements

Update the Github templates to use multiple labels
Use Gem caching our BK
Add Ruby 2.7 testing
Use Debian 10 Ruby containers not Debian 9

Signed-off-by: Tim Smith <tsmith@chef.io>
---
 .expeditor/config.yml          |  1 +
 .expeditor/run_linux_tests.sh  | 53 ++++++++++++++++++++++++++++++++++++++++++
 .expeditor/verify.pipeline.yml | 22 +++++++++++-------
 3 files changed, 67 insertions(+), 9 deletions(-)
 create mode 100755 .expeditor/run_linux_tests.sh

(limited to '.expeditor')

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index a12a3fd..dbbf886 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -1,5 +1,6 @@
 # Documentation available at https://expeditor.chef.io/docs/getting-started/
 ---
+
 # Slack channel in Chef Software slack to send notifications about build failures, etc
 slack:
   notify_channel: chef-found-notify
diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh
new file mode 100755
index 0000000..4c14c80
--- /dev/null
+++ b/.expeditor/run_linux_tests.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+#
+# This script runs a passed in command, but first setups up the bundler caching on the repo
+
+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
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 7865325..ea2b9f8 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -8,30 +8,34 @@ steps:
 
 - label: run-lint-and-specs-ruby-2.4
   command:
-    - bundle install --jobs=7 --retry=3 --without docs debug
-    - bundle exec rake
+    - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.4-stretch
+        image: ruby:2.4-buster
 
 - label: run-lint-and-specs-ruby-2.5
   command:
-    - bundle install --jobs=7 --retry=3 --without docs debug
-    - bundle exec rake
+    - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.5-stretch
+        image: ruby:2.5-buster
 
 - label: run-lint-and-specs-ruby-2.6
   command:
-    - bundle install --jobs=7 --retry=3 --without docs debug
-    - bundle exec rake
+    - .expeditor/run_linux_tests.sh rake
+  expeditor:
+    executor:
+      docker:
+        image: ruby:2.6-buster
+- label: run-lint-and-specs-ruby-2.7rc
+  command:
+    - .expeditor/run_linux_tests.sh rake
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: ruby:2.7-rc-buster
 
 - label: run-specs-windows
   command:
-- 
cgit v1.2.1