From f4ca8071542f6843cb5226cb82e46b630a707372 Mon Sep 17 00:00:00 2001 From: "Christopher A. Snapp" Date: Tue, 12 Jan 2021 15:14:44 -0700 Subject: Manually install necessary Ruby for verify pipeline Signed-off-by: Christopher A. Snapp --- .expeditor/scripts/bk_linux_exec.sh | 20 ++++++++++++----- .expeditor/verify.pipeline.yml | 45 ++++++++++++++++++++++++------------- 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/.expeditor/scripts/bk_linux_exec.sh b/.expeditor/scripts/bk_linux_exec.sh index f1202bbcbb..fbfd376581 100755 --- a/.expeditor/scripts/bk_linux_exec.sh +++ b/.expeditor/scripts/bk_linux_exec.sh @@ -11,21 +11,29 @@ sudo systemctl start docker echo "--- Installing package deps" sudo yum install -y gcc gcc-c++ openssl-devel readline-devel zlib-devel -# Install omnibus-toolchain for git bundler and gem -echo "--- Installing omnibus toolchain" -curl -fsSL https://chef.io/chef/install.sh | sudo bash -s -- -P omnibus-toolchain +# Install ASDF +echo "--- Installing asdf to ${HOME}/.asdf" +git clone https://github.com/asdf-vm/asdf.git "${HOME}/.asdf" +cd "${HOME}/.asdf"; git checkout "$(git describe --abbrev=0 --tags)"; cd - +. "${HOME}/.asdf/asdf.sh" + +# Install Ruby +ruby_version=$(sed -n '/"ruby"/{s/.*version: "//;s/"//;p;}' omnibus_overrides.rb) +echo "--- Installing Ruby $ruby_version" +asdf plugin add ruby +asdf install ruby $ruby_version +asdf global ruby $ruby_version # Set Environment Variables export BUNDLE_GEMFILE=$PWD/kitchen-tests/Gemfile export FORCE_FFI_YAJL=ext export CHEF_LICENSE="accept-silent" -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 ) -/opt/omnibus-toolchain/bin/bundle install --jobs=3 --retry=3 --path=../vendor/bundle +bundle install --jobs=3 --retry=3 --path=../vendor/bundle echo "--- Config information" @@ -40,4 +48,4 @@ docker version echo "!!!! DOCKER STATUS !!!!" sudo service docker status -echo "+++ Running tests" \ No newline at end of file +echo "+++ Running tests" diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index efba47cd86..e2167748dd 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -367,8 +367,9 @@ steps: - label: "Kitchen: Amazon Linux 2" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-amazonlinux-2 + - bundle exec kitchen test end-to-end-amazonlinux-2 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -382,8 +383,9 @@ steps: - label: "Kitchen: Ubuntu 16.04" commands: - scripts/bk_tests/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-1604 + - bundle exec kitchen test end-to-end-ubuntu-1604 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -398,8 +400,9 @@ steps: - label: "Kitchen: Ubuntu 18.04" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-1804 + - bundle exec kitchen test end-to-end-ubuntu-1804 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -413,8 +416,9 @@ steps: - label: "Kitchen: Ubuntu 20.04" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2004 + - bundle exec kitchen test end-to-end-ubuntu-2004 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -428,8 +432,9 @@ steps: - label: "Kitchen: Ubuntu 21.04" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-ubuntu-2104 + - bundle exec kitchen test end-to-end-ubuntu-2104 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -443,8 +448,9 @@ steps: - label: "Kitchen: Debian 9" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-9 + - bundle exec kitchen test end-to-end-debian-9 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -458,8 +464,9 @@ steps: - label: "Kitchen: Debian 10" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-10 + - bundle exec kitchen test end-to-end-debian-10 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -473,8 +480,9 @@ steps: - label: "Kitchen: Debian 11" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-debian-11 + - bundle exec kitchen test end-to-end-debian-11 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -488,8 +496,9 @@ steps: - label: "Kitchen: CentOS 6" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-6 + - bundle exec kitchen test end-to-end-centos-6 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -503,8 +512,9 @@ steps: - label: "Kitchen: CentOS 7" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-7 + - bundle exec kitchen test end-to-end-centos-7 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -518,8 +528,9 @@ steps: - label: "Kitchen: CentOS 8" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-centos-8 + - bundle exec kitchen test end-to-end-centos-8 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -533,8 +544,9 @@ steps: - label: "Kitchen: Oracle Linux 7" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-oraclelinux-7 + - bundle exec kitchen test end-to-end-oraclelinux-7 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -548,8 +560,9 @@ steps: - label: "Kitchen: Oracle Linux 8" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-oraclelinux-8 + - bundle exec kitchen test end-to-end-oraclelinux-8 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -563,8 +576,9 @@ steps: - label: "Kitchen: Fedora latest" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-fedora-latest + - bundle exec kitchen test end-to-end-fedora-latest artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: @@ -578,8 +592,9 @@ steps: - label: "Kitchen: openSUSE Leap: 15" commands: - .expeditor/scripts/bk_linux_exec.sh + - . /var/lib/buildkite-agent/.asdf/asdf.sh - cd kitchen-tests - - /opt/omnibus-toolchain/bin/bundle exec kitchen test end-to-end-opensuse-leap-15 + - bundle exec kitchen test end-to-end-opensuse-leap-15 artifact_paths: - $PWD/.kitchen/logs/kitchen.log env: -- cgit v1.2.1