diff options
author | Tim Smith <tsmith@chef.io> | 2019-02-05 14:18:23 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-05 14:18:23 -0800 |
commit | 8632d8cfdd935f170586a07543edd9e07821c567 (patch) | |
tree | ef0e5e1d6bf76c617b44f56958f5a2a5564f7574 | |
parent | 0773dfdb8b2d5f9a60057ececac5f1738d041ea5 (diff) | |
parent | 60874b3632f2089b1d6008a479e7018d45c314e8 (diff) | |
download | chef-8632d8cfdd935f170586a07543edd9e07821c567.tar.gz |
Merge pull request #8194 from chef/updates
Update rubygems to 2.7.8 and bundler to 1.17.3
-rw-r--r-- | .travis.yml | 21 | ||||
-rw-r--r-- | omnibus/Gemfile.lock | 10 | ||||
-rw-r--r-- | omnibus_overrides.rb | 4 | ||||
-rw-r--r-- | spec/unit/knife/bootstrap_spec.rb | 1 |
4 files changed, 29 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 1243ac5fcf..17db766359 100644 --- a/.travis.yml +++ b/.travis.yml @@ -362,6 +362,23 @@ matrix: env: - RSPEC_CENTOS=7 - KITCHEN_YAML=kitchen.travis.yml + - rvm: 2.5.3 + services: docker + sudo: required + gemfile: kitchen-tests/Gemfile + before_install: + - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) + - gem install bundler -v $(grep :bundler omnibus_overrides.rb | cut -d'"' -f2) + before_script: + - sudo iptables -L DOCKER || ( echo "DOCKER iptables chain missing" ; sudo iptables -N DOCKER ) + - cd kitchen-tests + script: + - bundle exec kitchen test rspec-opensuse-leap + after_failure: + - cat .kitchen/logs/kitchen.log + env: + - RSPEC_OPENSUSELEAP=42 + - KITCHEN_YAML=kitchen.travis.yml allow_failures: - rvm: 2.5.3 services: docker @@ -380,6 +397,10 @@ matrix: env: - RSPEC_OPENSUSELEAP=42 - KITCHEN_YAML=kitchen.travis.yml + - env: + TEST_GEM: poise/halite + script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec + rvm: 2.5.3 notifications: on_change: true diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index c372f42004..ca550c9548 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -63,10 +63,10 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (10.0.2) - chef (14.9.13) + chef (14.10.9) addressable bundler (>= 1.10) - chef-config (= 14.9.13) + chef-config (= 14.10.9) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -93,10 +93,10 @@ GEM specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.9.13-universal-mingw32) + chef (14.10.9-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.9.13) + chef-config (= 14.10.9) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -136,7 +136,7 @@ GEM win32-taskscheduler (~> 2.0) windows-api (~> 0.4.4) wmi-lite (~> 1.0) - chef-config (14.9.13) + chef-config (14.10.9) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index a6d447ae95..a736a03391 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -4,8 +4,8 @@ # # NOTE: You MUST update omnibus-software when adding new versions of # software here: bundle exec rake dependencies:update_omnibus_gemfile_lock -override :rubygems, version: "2.7.6" -override :bundler, version: "1.16.1" +override :rubygems, version: "2.7.8" +override :bundler, version: "1.17.3" override "nokogiri", version: "1.10.1" override "libffi", version: "3.2.1" override "libiconv", version: "1.15" diff --git a/spec/unit/knife/bootstrap_spec.rb b/spec/unit/knife/bootstrap_spec.rb index 624261fb8b..258d193cf1 100644 --- a/spec/unit/knife/bootstrap_spec.rb +++ b/spec/unit/knife/bootstrap_spec.rb @@ -442,6 +442,7 @@ describe Chef::Knife::Bootstrap do end it "doesn't create /etc/chef/trusted_certs if :trusted_certs_dir is empty" do + allow(Dir).to receive(:glob).and_call_original expect(Dir).to receive(:glob).with(File.join(trusted_certs_dir, "*.{crt,pem}")).and_return([]) expect(rendered_template).not_to match(%r{mkdir -p /etc/chef/trusted_certs}) end |