diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-05-07 20:52:18 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-05-07 21:44:57 -0700 |
| commit | c31038e78a8203e5674b243fcb106b9b207aa168 (patch) | |
| tree | 69240e5043fd642587b1997c2559e32de27d832e /scripts | |
| parent | 345da31ab9ac61d88bd06eca058f26ed5cbbd633 (diff) | |
| download | chef-c31038e78a8203e5674b243fcb106b9b207aa168.tar.gz | |
Try removing asdf entirely and just use omnibus-toolchaintesting
It seems odd that we install ruby over ruby
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bk_tests/bk_linux_exec.sh | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/scripts/bk_tests/bk_linux_exec.sh b/scripts/bk_tests/bk_linux_exec.sh index 334bb740f0..415f646a3c 100755 --- a/scripts/bk_tests/bk_linux_exec.sh +++ b/scripts/bk_tests/bk_linux_exec.sh @@ -19,24 +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.7.1" -/opt/asdf/bin/asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git -/opt/asdf/bin/asdf install ruby 2.7.1 -/opt/asdf/bin/asdf global ruby 2.7.1 +export PATH=$PATH:/opt/omnibus-toolchain/embedded/bin # Update Gems echo "--- Installing Gems" echo 'gem: --no-document' >> ~/.gemrc 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" |