diff options
| author | Tim Smith <tsmith@chef.io> | 2020-03-31 19:51:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 19:51:42 -0700 |
| commit | d88e9ead38a080763f8b74c7756d8d409ed7aad2 (patch) | |
| tree | a4edf9bee778ead47ef5ce5ecb847c283553c2a5 | |
| parent | 9e690e8ae0b879f09a5202ee45cb894a99ca74da (diff) | |
| parent | 43885e0698856ea53a63dda90751a4fd83a04b35 (diff) | |
| download | ohai-d88e9ead38a080763f8b74c7756d8d409ed7aad2.tar.gz | |
Merge pull request #1443 from chef/expeditor_caching
Use native Expeditor gem caching & fix code owners
| -rwxr-xr-x | .expeditor/run_linux_tests.sh | 37 | ||||
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 6 | ||||
| -rw-r--r-- | .github/CODEOWNERS | 6 |
3 files changed, 7 insertions, 42 deletions
diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh index 2e6c34c0..7df19364 100755 --- a/.expeditor/run_linux_tests.sh +++ b/.expeditor/run_linux_tests.sh @@ -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 $@ diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 58152911..de19c28a 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -1,5 +1,7 @@ --- expeditor: + cached_folders: + - vendor defaults: buildkite: retry: @@ -14,7 +16,7 @@ steps: expeditor: executor: docker: - image: ruby:2.6-buster + image: ruby:2.7-buster - label: run-ohai command: @@ -22,7 +24,7 @@ steps: expeditor: executor: docker: - image: ruby:2.6-buster + image: ruby:2.7-buster - label: run-specs-ruby-2.5 command: diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9dbcc7ba..ab984170 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -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 |