summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2020-04-07 09:23:00 -0700
committerGitHub <noreply@github.com>2020-04-07 09:23:00 -0700
commit96406e06f0eb06281c6eb62a2bed9ebd0b3d5a8e (patch)
tree2adccfce3db1e631d24bf119f1907e25fa902368 /scripts
parentb2ea23fabeed43a12fb5d3c8a70fc57a336757b0 (diff)
parentb8354586de407001a62472f55687d6da8a7f2f4f (diff)
downloadchef-96406e06f0eb06281c6eb62a2bed9ebd0b3d5a8e.tar.gz
Merge pull request #9607 from chef/cache_gems
Cache gems in the verify pipeline to speed up tests
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/bk_tests/bk_container_prep.sh2
-rwxr-xr-xscripts/bk_tests/bk_linux_exec.sh25
2 files changed, 16 insertions, 11 deletions
diff --git a/scripts/bk_tests/bk_container_prep.sh b/scripts/bk_tests/bk_container_prep.sh
index 8c3bda15e0..0e9c44b583 100755
--- a/scripts/bk_tests/bk_container_prep.sh
+++ b/scripts/bk_tests/bk_container_prep.sh
@@ -20,4 +20,4 @@ gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2)
bundle --version
rm -f .bundle/config
-echo +++ testing
+echo "+++ Run tests"
diff --git a/scripts/bk_tests/bk_linux_exec.sh b/scripts/bk_tests/bk_linux_exec.sh
index b4bbce59f9..0325b9af44 100755
--- a/scripts/bk_tests/bk_linux_exec.sh
+++ b/scripts/bk_tests/bk_linux_exec.sh
@@ -3,15 +3,10 @@
# Enable IPv6 in docker
echo "--- Enabling ipv6 on docker"
sudo systemctl stop docker
-echo "Enabling IPv6 in Docker config"
dockerd_config="/etc/docker/daemon.json"
sudo echo "$(jq '. + {"ipv6": true, "fixed-cidr-v6": "2001:2019:6002::/80", "ip-forward": false}' $dockerd_config)" > $dockerd_config
sudo systemctl start docker
-# Verify Docker Is Running
-docker version
-sudo service docker status
-
# Install C and C++
echo "--- Installing package deps"
sudo yum install -y gcc gcc-c++ openssl-devel readline-devel zlib-devel
@@ -32,17 +27,27 @@ sudo 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.6.6"
+/opt/asdf/bin/asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git
/opt/asdf/bin/asdf install ruby 2.6.6
/opt/asdf/bin/asdf global ruby 2.6.6
# Update Gems
+echo 'gem: --no-document' >> ~/.gemrc
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
+gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2) --force
sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER )
+bundle install --jobs=3 --retry=3 --path=vendor/bundle
+
+echo "--- Config information"
+
+echo "!!!! RUBY VERSION !!!!"
ruby --version
+echo "!!!! BUNDLE LOCATION !!!!"
which bundle
-bundle install --jobs=3 --retry=3 --path=vendor/bundle \ No newline at end of file
+echo "!!!! DOCKER VERSION !!!!"
+docker version
+echo "!!!! DOCKER STATUS !!!!"
+sudo service docker status
+
+echo "+++ Running tests" \ No newline at end of file