summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher A. Snapp <csnapp@chef.io>2021-01-12 16:04:58 -0700
committerChristopher A. Snapp <csnapp@chef.io>2021-01-12 16:04:58 -0700
commitc87f3600eb5c55f84a84e59b38bba2033c010840 (patch)
treea84380372e82da3a4b89157d026b432342230d6e
parent8761259eb1f60882d5d0c24dd920e25b57b07a67 (diff)
downloadchef-c87f3600eb5c55f84a84e59b38bba2033c010840.tar.gz
Manually install necessary Ruby for verify pipelinecsnapp/add_ruby_to_chef15_verify_pipeline
Signed-off-by: Christopher A. Snapp <csnapp@chef.io>
-rw-r--r--.expeditor/verify.pipeline.yml42
-rwxr-xr-xscripts/bk_tests/bk_linux_exec.sh24
2 files changed, 45 insertions, 21 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 96dd9be35e..bcec3dc592 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -328,8 +328,9 @@ steps:
- label: "Kitchen: Amazon Linux 201X"
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-amazonlinux
+ - bundle exec kitchen test end-to-end-amazonlinux
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -343,8 +344,9 @@ steps:
- label: "Kitchen: Amazon Linux 2"
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-amazonlinux-2
+ - bundle exec kitchen test end-to-end-amazonlinux-2
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -358,8 +360,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:
@@ -374,8 +377,9 @@ steps:
- label: "Kitchen: Ubuntu 18.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-1804
+ - bundle exec kitchen test end-to-end-ubuntu-1804
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -389,8 +393,9 @@ steps:
- label: "Kitchen: Ubuntu 20.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-2004
+ - bundle exec kitchen test end-to-end-ubuntu-2004
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -404,8 +409,9 @@ steps:
- label: "Kitchen: Debian 8"
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-debian-8
+ - bundle exec kitchen test end-to-end-debian-8
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -419,8 +425,9 @@ steps:
- label: "Kitchen: Debian 9"
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-debian-9
+ - bundle exec kitchen test end-to-end-debian-9
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -434,8 +441,9 @@ steps:
- label: "Kitchen: Debian 10"
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-debian-10
+ - bundle exec kitchen test end-to-end-debian-10
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -449,8 +457,9 @@ steps:
- label: "Kitchen: CentOS 6"
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-centos-6
+ - bundle exec kitchen test end-to-end-centos-6
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -464,8 +473,9 @@ steps:
- label: "Kitchen: CentOS 7"
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-centos-7
+ - bundle exec kitchen test end-to-end-centos-7
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -479,8 +489,9 @@ steps:
- label: "Kitchen: CentOS 8"
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-centos-8
+ - bundle exec kitchen test end-to-end-centos-8
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -494,8 +505,9 @@ steps:
- label: "Kitchen: Oracle Linux 7"
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-oraclelinux-7
+ - bundle exec kitchen test end-to-end-oraclelinux-7
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -509,8 +521,9 @@ steps:
- label: "Kitchen: Fedora latest"
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-fedora-latest
+ - bundle exec kitchen test end-to-end-fedora-latest
artifact_paths:
- $PWD/.kitchen/logs/kitchen.log
env:
@@ -524,8 +537,9 @@ steps:
- label: "Kitchen: openSUSE Leap: 15"
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-opensuse-leap-15
+ - 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 415f646a3c..fbfd376581 100755
--- a/scripts/bk_tests/bk_linux_exec.sh
+++ b/scripts/bk_tests/bk_linux_exec.sh
@@ -11,31 +11,41 @@ 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"
echo "!!!! RUBY VERSION !!!!"
ruby --version
-echo "!!!! BUNDLE LOCATION !!!!"
+echo "!!!! BUNDLER LOCATION !!!!"
which bundle
+echo "!!!! BUNDLER VERSION !!!!"
+bundle -v
echo "!!!! DOCKER VERSION !!!!"
docker version
echo "!!!! DOCKER STATUS !!!!"
sudo service docker status
-echo "+++ Running tests" \ No newline at end of file
+echo "+++ Running tests"