Skip to content

Commit

Permalink
Use native Expeditor gem caching
Browse files Browse the repository at this point in the history
This should be faster

Signed-off-by: Tim Smith <[email protected]>
  • Loading branch information
tas50 committed Apr 1, 2020
1 parent 9e690e8 commit 43885e0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 42 deletions.
37 changes: 0 additions & 37 deletions .expeditor/run_linux_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,49 +5,12 @@
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 $@
6 changes: 4 additions & 2 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
---
expeditor:
cached_folders:
- vendor
defaults:
buildkite:
retry:
Expand All @@ -14,15 +16,15 @@ steps:
expeditor:
executor:
docker:
image: ruby:2.6-buster
image: ruby:2.7-buster

- label: run-ohai
command:
- .expeditor/run_linux_tests.sh "bundle exec ohai"
expeditor:
executor:
docker:
image: ruby:2.6-buster
image: ruby:2.7-buster

- label: run-specs-ruby-2.5
command:
Expand Down
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Order is important. The last matching pattern has the most precedence.

* @chef/chef-infra-reviewers
.expeditor/** @chef/jex-team
*.md @chef/docs-team
* @chef/chef-infra-reviewers @chef/chef-infra-approvers @chef/chef-infra-owners
.expeditor/ @chef/jex-team
*.md @chef/docs-team

0 comments on commit 43885e0

Please sign in to comment.