diff --git a/.ci/before_script.sh b/.ci/before_script.sh index 4dd2066a..0e5fff54 100644 --- a/.ci/before_script.sh +++ b/.ci/before_script.sh @@ -6,13 +6,10 @@ set -e function update_linux() { sudo apt-get update -qq sudo apt-get install -qq python-apt python-pycurl git python-pip build-essential autoconf rpm - gem update --system - gem install bundler } function install_ansible { bash .ci/ansible-setup.sh - bundle install # pyOpen, ndg-* and pyasn1 are for 'InsecurePlatformWarning' error ~/.avm/v2.3/venv/bin/pip install netaddr ansible-lint pyOpenSSL ndg-httpsclient pyasn1 ~/.avm/v2.5/venv/bin/pip install netaddr ansible-lint pyOpenSSL ndg-httpsclient pyasn1 diff --git a/.kitchen.yml b/.kitchen.yml index 805bb28f..30a7037a 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -136,8 +136,6 @@ suites: verifier: patterns: - roles/git-secret/.ci/integration/gnupg-git/serverspec/*_spec.rb - bundler_path: '/usr/local/bin' - rspec_path: '/usr/local/bin' excludes: - ubuntu-latest - centos-latest diff --git a/.travis.yml b/.travis.yml index b216d5c2..96a938c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,6 +87,10 @@ matrix: language: ruby rvm: 2.6 +before_install: + - gem update --system + - gem install bundler + before_script: - chmod +x ".ci/before_script.sh" && ".ci/before_script.sh"