diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-05-21 13:47:42 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-05-21 13:47:42 -0700 |
| commit | dff95db78a85cc888e30e520a2d5be906dd2792e (patch) | |
| tree | a45f3d7fa890dd0a4b63cbe3e070780e024b9c53 | |
| parent | ec01278f244c6cfcf3cca419720f51e0c3a8d02b (diff) | |
| download | chef-dff95db78a85cc888e30e520a2d5be906dd2792e.tar.gz | |
Use built-in Expeditor gem caching
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 18 | ||||
| -rwxr-xr-x | scripts/bk_tests/bk_linux_exec.sh | 19 |
2 files changed, 13 insertions, 24 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 191ef69d0d..996b0c0c46 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -1,11 +1,13 @@ --- -expeditor: - defaults: - buildkite: - retry: - automatic: - limit: 1 - timeout_in_minutes: 30 + expeditor: + cached_folders: + - vendor + defaults: + buildkite: + retry: + automatic: + limit: 1 + timeout_in_minutes: 30 steps: @@ -222,7 +224,7 @@ steps: - vendor executor: docker: - image: rubydistros/ubuntu-18.04 + image: rubydistros/ubuntu-18.04:2.6 ######################################################################### # Tests Ruby 2.5 diff --git a/scripts/bk_tests/bk_linux_exec.sh b/scripts/bk_tests/bk_linux_exec.sh index 743f1f9872..415f646a3c 100755 --- a/scripts/bk_tests/bk_linux_exec.sh +++ b/scripts/bk_tests/bk_linux_exec.sh @@ -19,26 +19,13 @@ curl -fsSL https://chef.io/chef/install.sh | sudo bash -s -- -P omnibus-toolchai export BUNDLE_GEMFILE=$PWD/kitchen-tests/Gemfile export FORCE_FFI_YAJL=ext export CHEF_LICENSE="accept-silent" -export PATH=$PATH:~/.asdf/shims:/opt/asdf/bin:/opt/asdf/shims:/opt/omnibus-toolchain/embedded/bin - -# Install ASDF software manager -echo "--- Installing ASDF software version manager from master" -sudo git clone https://github.com/asdf-vm/asdf.git /opt/asdf -. /opt/asdf/asdf.sh -. /opt/asdf/completions/asdf.bash - -echo "--- Installing Ruby 2.6.6" -/opt/asdf/bin/asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git - -/opt/asdf/bin/asdf install ruby 2.6.6 -/opt/asdf/bin/asdf global ruby 2.6.6 +export PATH=$PATH:/opt/omnibus-toolchain/embedded/bin # Update Gems +echo "--- Installing Gems" echo 'gem: --no-document' >> ~/.gemrc -gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) -gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2) --force sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) -bundle install --jobs=3 --retry=3 --path=vendor/bundle +/opt/omnibus-toolchain/bin/bundle install --jobs=3 --retry=3 --path=../vendor/bundle echo "--- Config information" |