diff options
| -rw-r--r-- | .travis.yml | 54 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 25 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
3 files changed, 41 insertions, 40 deletions
diff --git a/.travis.yml b/.travis.yml index 17db766359..3e24f19e2e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ matrix: bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: INTEGRATION_SPECS_25: 1 - rvm: 2.5.3 + rvm: 2.5.4 sudo: true script: sudo -E $(which bundle) exec rake spec:integration; bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen @@ -61,7 +61,7 @@ matrix: bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: FUNCTIONAL_SPECS_25: 1 - rvm: 2.5.3 + rvm: 2.5.4 sudo: true # the travis apt proxy screws with our functional testing something fierce script: sudo rm -f /etc/apt/apt.conf.d/99-travis-apt-proxy; sudo -E $(which bundle) exec rake spec:functional; @@ -82,7 +82,7 @@ matrix: bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: UNIT_SPECS_25: 1 - rvm: 2.5.3 + rvm: 2.5.4 sudo: true script: - sudo -E $(which bundle) exec rake spec:unit; @@ -98,7 +98,7 @@ matrix: bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - env: CHEFSTYLE: 1 - rvm: 2.5.3 + rvm: 2.5.4 script: bundle exec rake style # also remove integration / external tests bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen @@ -108,36 +108,36 @@ matrix: - env: TEST_GEM: sethvargo/chef-sugar script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake - rvm: 2.5.3 + rvm: 2.5.4 - env: - PEDANT_OPTS=--skip-oc_id - TEST_GEM=chef/chef-zero - CHEF_FS=true script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake pedant - rvm: 2.5.3 + rvm: 2.5.4 - env: TEST_GEM: chef/cheffish script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec - rvm: 2.5.3 + rvm: 2.5.4 - env: TEST_GEM: chefspec/chefspec script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake - rvm: 2.5.3 + rvm: 2.5.4 - env: TEST_GEM: poise/halite script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec - rvm: 2.5.3 + rvm: 2.5.4 - env: TEST_GEM: chef/knife-windows script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec - rvm: 2.5.3 + rvm: 2.5.4 # disable this pending a Chef 14 compat version of poise # - env: # TEST_GEM: poise/poise # script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec - # rvm: 2.5.3 + # rvm: 2.5.4 ### START TEST KITCHEN ONLY ### - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -154,7 +154,7 @@ matrix: env: - AMAZON=2 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -171,7 +171,7 @@ matrix: env: - AMAZON=201X - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -188,7 +188,7 @@ matrix: env: - UBUNTU=14.04 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -205,7 +205,7 @@ matrix: env: - UBUNTU=16.04 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -222,7 +222,7 @@ matrix: env: - UBUNTU=18.04 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -239,7 +239,7 @@ matrix: env: - DEBIAN=8 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -256,7 +256,7 @@ matrix: env: - DEBIAN=9 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -273,7 +273,7 @@ matrix: env: - CENTOS=6 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -290,7 +290,7 @@ matrix: env: - CENTOS=7 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -307,7 +307,7 @@ matrix: env: - FEDORA=latest - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -324,7 +324,7 @@ matrix: env: - OPENSUSELEAP=42 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 sudo: required before_install: - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2) @@ -345,7 +345,7 @@ matrix: - sudo cat /var/log/squid3/access.log # Use test-kitchen to launch a centos docker container to run the full rspec tests against. This catches # errors in travis, before PRs are merged, hopefully before they become errors in jenkins. - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -362,7 +362,7 @@ matrix: env: - RSPEC_CENTOS=7 - KITCHEN_YAML=kitchen.travis.yml - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -380,7 +380,7 @@ matrix: - RSPEC_OPENSUSELEAP=42 - KITCHEN_YAML=kitchen.travis.yml allow_failures: - - rvm: 2.5.3 + - rvm: 2.5.4 services: docker sudo: required gemfile: kitchen-tests/Gemfile @@ -400,7 +400,7 @@ matrix: - env: TEST_GEM: poise/halite script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec - rvm: 2.5.3 + rvm: 2.5.4 notifications: on_change: true diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 93b3d2fb8f..6328496c18 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,7 +18,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 44f52c320c3fe866e4d4186319fb6b5537f0656f + revision: 10c8c40cefd6c86319963a0485df4f7c29281b4a branch: master specs: omnibus-software (4.0.0) @@ -31,8 +31,8 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-eventstream (1.0.1) - aws-partitions (1.141.0) + aws-eventstream (1.0.2) + aws-partitions (1.144.0) aws-sdk-core (3.46.2) aws-eventstream (~> 1.0) aws-partitions (~> 1.0) @@ -41,11 +41,12 @@ GEM aws-sdk-kms (1.13.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sigv4 (~> 1.0) - aws-sdk-s3 (1.30.1) + aws-sdk-s3 (1.31.0) aws-sdk-core (~> 3, >= 3.39.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.0) - aws-sigv4 (1.0.3) + aws-sigv4 (1.1.0) + aws-eventstream (~> 1.0, >= 1.0.2) berkshelf (7.0.7) chef (>= 13.6.52) chef-config @@ -63,10 +64,10 @@ GEM debug_inspector (>= 0.0.1) builder (3.2.3) byebug (11.0.0) - chef (14.10.9) + chef (14.11.21) addressable bundler (>= 1.10) - chef-config (= 14.10.9) + chef-config (= 14.11.21) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -93,10 +94,10 @@ GEM specinfra (~> 2.10) syslog-logger (~> 1.6) uuidtools (~> 2.1.5) - chef (14.10.9-universal-mingw32) + chef (14.11.21-universal-mingw32) addressable bundler (>= 1.10) - chef-config (= 14.10.9) + chef-config (= 14.11.21) chef-zero (>= 13.0) diff-lcs (~> 1.2, >= 1.2.4) erubis (~> 2.7) @@ -125,7 +126,7 @@ GEM syslog-logger (~> 1.6) uuidtools (~> 2.1.5) win32-api (~> 1.5.3) - win32-certstore (>= 0.1.8) + win32-certstore (~> 0.2.4) win32-dir (~> 0.5.0) win32-event (~> 0.6.1) win32-eventlog (= 0.6.3) @@ -136,7 +137,7 @@ GEM win32-taskscheduler (~> 2.0) windows-api (~> 0.4.4) wmi-lite (~> 1.0) - chef-config (14.10.9) + chef-config (14.11.21) addressable fuzzyurl mixlib-config (>= 2.2.12, < 3.0) @@ -152,7 +153,7 @@ GEM citrus (3.0.2) cleanroom (1.0.0) coderay (1.1.2) - concurrent-ruby (1.1.4) + concurrent-ruby (1.1.5) debug_inspector (0.0.3) diff-lcs (1.3) erubis (2.7.0) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 1b789bc926..a542696859 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -17,7 +17,7 @@ override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" override "pkg-config-lite", version: "0.28-1" -override "ruby", version: "2.5.3" +override "ruby", version: "2.5.4" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" override "util-macros", version: "1.19.0" override "xproto", version: "7.0.28" |