Skip to content

Commit

Permalink
Update expeditor config for new gem caching
Browse files Browse the repository at this point in the history
Use the new features here

Signed-off-by: Tim Smith <tsmith@chef.io>
  • Loading branch information
tas50 committed Aug 12, 2020
1 parent 585d932 commit 7d2de2b
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .expeditor/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Slack channel in Chef Software slack to send notifications about build failures, etc
slack:
notify_channel: sustaining-notify
notify_channel: chef-infra-notify

# This publish is triggered by the `built_in:publish_rubygems` artifact_action.
rubygems:
Expand Down
39 changes: 1 addition & 38 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 $1
bundle exec $@
9 changes: 9 additions & 0 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
---
expeditor:
cached_folders:
- vendor
defaults:
buildkite:
retry:
automatic:
limit: 1
timeout_in_minutes: 30

steps:

Expand Down

0 comments on commit 7d2de2b

Please sign in to comment.