Add tests for CentOS & SUSE

Cross your fingers

Signed-off-by: Tim Smith <tsmith@chef.io>

3 files changed, 26 insertions, 46 deletions

diff --git a/scripts/bk_tests/bk_container_prep.sh b/scripts/bk_tests/bk_container_prep.sh
new file mode 100755
index 0000000000..f5d9621599
--- /dev/null
+++ b/scripts/bk_tests/bk_container_prep.sh
@@ -0,0 +1,26 @@
+# This script gets a container ready to run our various tests in BuildKite
+
+# make sure we have the network tools in place for various network specs
+if [ -f /etc/debian_version ]; then
+	apt-get update -y && apt-get install -y net-tools iproute2
+	touch /etc/network/interfaces
+else
+	yum install -y net-tools
+fi
+
+# git and build tools
+if [ -f /etc/redhat-release ]; then
+  yum install -y git make gcc gcc-c++ openssl-devel readline-devel zlib-devel which
+fi
+
+# make sure we have the omnibus_overrides specified version of rubygems / bundler
+gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
+gem --version
+gem uninstall bundler -a -x || true
+gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
+bundle --version
+rm -f .bundle/config
+
+# force all .rspec tests into progress display to reduce line count
+echo --color > .rspec
+echo -fp >> .rspec
diff --git a/scripts/bk_tests/bk_dokken_install.sh b/scripts/bk_tests/bk_dokken_install.sh
deleted file mode 100755
index 3dd03deecf..0000000000
--- a/scripts/bk_tests/bk_dokken_install.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-# Install omnibus-toolchain for git bundler and gem
-curl -fsSL https://chef.io/chef/install.sh | sudo bash -s -- -P omnibus-toolchain
-
-# Set Environment Variables
-export BUNDLE_GEMFILE=$PWD/kitchen-tests/Gemfile
-export FORCE_FFI_YAJL=ext
-export CHEF_LICENSE="accept-silent"
-export PATH=/opt/asdf/bin:/opt/asdf/shims:/opt/omnibus-toolchain/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-# Install Dev tools
-sudo yum install -y gcc gcc-c++ openssl-devel readline-devel zlib-devel iptables
-sudo zypper install -y gcc gcc-c++ openssl-devel readline-devel zlib-devel iptables
-
-# Install ASDF software manager
-echo "--- Installing ASDF software version manager from master"
-sudo /opt/omnibus-toolchain/embedded/bin/git clone https://github.com/asdf-vm/asdf.git /opt/asdf
-. /opt/asdf/asdf.sh
-. /opt/asdf/completions/asdf.bash
-
-echo "--- Installing Ruby ASDF plugin"
-/opt/asdf/bin/asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git 
-
-echo "--- Installing Ruby 2.5.5"
-/opt/asdf/bin/asdf install ruby 2.5.5
-/opt/asdf/bin/asdf global ruby 2.5.5
-
-# Update Gems
-gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2) --force --no-document
-sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
-ruby --version
-which bundle
-bundle install --jobs=3 --retry=3 --path=vendor/bundle
\ No newline at end of file
diff --git a/scripts/bk_tests/bk_install.sh b/scripts/bk_tests/bk_install.sh
deleted file mode 100755
index e8fefc2d02..0000000000
--- a/scripts/bk_tests/bk_install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-apt-get update -y && apt-get install -y net-tools iproute2
-touch /etc/network/interfaces
-gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
-gem --version
-gem uninstall bundler -a -x || true
-gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
-bundle --version
-rm -f .bundle/config
-# force all .rspec tests into progress display to reduce line count
-echo --color > .rspec
-echo -fp >> .rspec