diff options
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 28 | ||||
| -rwxr-xr-x | scripts/bk_tests/bk_linux_exec.sh | 15 |
2 files changed, 16 insertions, 27 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 2b06113617..9078c029b0 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -326,7 +326,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-amazonlinux-2 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-amazonlinux-2 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -341,7 +341,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-amazonlinux-2 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-amazonlinux-2 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -356,7 +356,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-ubuntu-1604 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-1604 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -372,7 +372,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-ubuntu-1804 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-1804 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -387,7 +387,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-ubuntu-2004 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2004 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -402,7 +402,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-debian-8 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-8 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -417,7 +417,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-debian-9 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-9 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -432,7 +432,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-debian-10 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-10 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -447,7 +447,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-centos-6 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-6 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -462,7 +462,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-centos-7 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-7 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -477,7 +477,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-centos-8 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-8 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -492,7 +492,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-oraclelinux-7 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-oraclelinux-7 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -507,7 +507,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-fedora-latest + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-fedora-latest artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -522,7 +522,7 @@ steps: commands: - scripts/bk_tests/bk_linux_exec.sh - cd kitchen-tests - - ~/.asdf/shims/bundle exec kitchen test end-to-end-opensuse-leap-15 + - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-opensuse-leap-15 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: 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" |