From c31038e78a8203e5674b243fcb106b9b207aa168 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Thu, 7 May 2020 20:52:18 -0700 Subject: Try removing asdf entirely and just use omnibus-toolchain It seems odd that we install ruby over ruby Signed-off-by: Tim Smith --- scripts/bk_tests/bk_linux_exec.sh | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'scripts') 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" -- cgit v1.2.1