diff options
| author | Tim Smith <tsmith84@gmail.com> | 2020-04-05 18:18:05 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2020-04-05 18:18:05 -0700 |
| commit | ce128b6409305bab27565f5c33facd8c946499cf (patch) | |
| tree | 247e779f93899c29dfc63835bb1e17f5d6725d28 | |
| parent | f6475a376f45731b38b59392c5551b5fe83f2e6a (diff) | |
| download | chef-ce128b6409305bab27565f5c33facd8c946499cf.tar.gz | |
Move all the config version stuff to it's own section
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rwxr-xr-x | scripts/bk_tests/bk_linux_exec.sh | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/scripts/bk_tests/bk_linux_exec.sh b/scripts/bk_tests/bk_linux_exec.sh index d5993293c9..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,10 +27,8 @@ 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 @@ -44,8 +37,17 @@ 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 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 +echo "!!!! DOCKER VERSION !!!!" +docker version +echo "!!!! DOCKER STATUS !!!!" +sudo service docker status echo "+++ Running tests"
\ No newline at end of file |