Use Ruby 2.1.9, add 2.3 to the list of tested versions

5 files changed, 28 insertions, 30 deletions

diff --git a/.travis.yml b/.travis.yml
index b81c538737..dfee9acd79 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,17 +30,17 @@ env:
 
 matrix:
   include:
-  - rvm: 2.1
+  - rvm: 2.1.9
     sudo: true
     script: sudo -E $(which bundle) exec rake spec;
     # also remove integration / external tests
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
-  - rvm: 2.2
+  - rvm: 2.2.5
     sudo: true
     script: sudo -E $(which bundle) exec rake spec;
     # also remove integration / external tests
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
-  - rvm: 2.3.0
+  - rvm: 2.3.1
     sudo: true
     script: sudo -E $(which bundle) exec rake spec;
     # also remove integration / external tests
@@ -52,13 +52,13 @@ matrix:
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
   - env:
       CHEFSTYLE: 1
-    rvm: 2.1
+    rvm: 2.2.5
     script: bundle exec rake style
     # also remove integration / external tests
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
   - env:
       AUDIT_CHECK: 1
-    rvm: 2.1
+    rvm: 2.2.5
     script: bundle exec bundle-audit check --update
     # also remove integration / external tests
     bundler_args: --without changelog development docgen guard integration maintenance omnibus_package tools aix bsd mac_os_x solaris windows --frozen
@@ -68,23 +68,23 @@ matrix:
   - env:
       TEST_GEM: chef-provisioning
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.2
+    rvm: 2.2.5
   - env:
       TEST_GEM: chef-provisioning-aws
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.2
+    rvm: 2.2.5
   - env:
       TEST_GEM: chef-sugar
     script: tasks/bin/run_external_test $TEST_GEM rake
-    rvm: 2.2
+    rvm: 2.2.5
   - env:
       - TEST_GEM: chef-zero
     script: tasks/bin/run_external_test $TEST_GEM rake spec cheffs
-    rvm: 2.2
+    rvm: 2.2.5
   - env:
       TEST_GEM: cheffish
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.2
+    rvm: 2.2.5
   - env:
       TEST_GEM: chefspec
     # The chefspec tests + bundler cache + "gem update --system" interact badly :/
@@ -93,26 +93,26 @@ matrix:
       - gem install bundler -v $(grep bundler omnibus_overrides.rb | cut -d'"' -f2)
       - bundle config --local without server:docgen:maintenance:omnibus_package:development:ruby_prof:pry
     script: tasks/bin/run_external_test $TEST_GEM rake
-    rvm: 2.2.0
+    rvm: 2.2.5
   - env:
       TEST_GEM: foodcritic
     script: tasks/bin/run_external_test $TEST_GEM rake test
-    rvm: 2.2
+    rvm: 2.2.5
   - env:
       TEST_GEM: halite
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.2
+    rvm: 2.2.5
   - env:
       TEST_GEM: knife-windows
     script: tasks/bin/run_external_test $TEST_GEM rake unit_spec
-    rvm: 2.2
+    rvm: 2.2.5
   - env:
       TEST_GEM: poise
     script: tasks/bin/run_external_test $TEST_GEM rake spec
-    rvm: 2.2
+    rvm: 2.2.5
   ### START TEST KITCHEN ONLY ###
   #
-  - rvm: 2.2
+  - rvm: 2.2.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -129,7 +129,7 @@ matrix:
     env:
       - UBUNTU=12.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2
+  - rvm: 2.2.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -146,7 +146,7 @@ matrix:
     env:
       - UBUNTU=14.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2
+  - rvm: 2.2.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -163,7 +163,7 @@ matrix:
     env:
       - UBUNTU=16.04
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2
+  - rvm: 2.2.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -180,7 +180,7 @@ matrix:
     env:
       - DEBIAN=7
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2
+  - rvm: 2.2.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -197,7 +197,7 @@ matrix:
     env:
       - DEBIAN=8
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2
+  - rvm: 2.2.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -214,7 +214,7 @@ matrix:
     env:
       - CENTOS=6
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2
+  - rvm: 2.2.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -231,7 +231,7 @@ matrix:
     env:
       - CENTOS=7
       - KITCHEN_YAML=.kitchen.travis.yml
-  - rvm: 2.2
+  - rvm: 2.2.5
     services: docker
     sudo: required
     gemfile: kitchen-tests/Gemfile
@@ -249,7 +249,7 @@ matrix:
       - FEDORA=23
       - KITCHEN_YAML=.kitchen.travis.yml
     ### END TEST KITCHEN ONLY ###
-  - rvm: 2.2
+  - rvm: 2.2.5
     sudo: required
     dist: trusty
     before_install:
@@ -270,7 +270,6 @@ matrix:
       - sudo cat /var/log/squid3/access.log
 
   allow_failures:
-    - rvm: 2.3.0
     - rvm: rbx
 
 notifications:
diff --git a/appveyor.yml b/appveyor.yml
index 7d89df1eb3..dd0b91517b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,8 +6,7 @@ platform:
 
 environment:
   matrix:
-    # 21-x64 is failing right now
-    #- ruby_version: "21-x64"
+    - ruby_version: "21-x64"
     - ruby_version: "21"
 
 clone_folder: c:\projects\chef
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 560f8000be..ce89460cec 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/chef/omnibus-software.git
-  revision: f9938ad5b52b79b6b8960f33cd2670608b499e3d
+  revision: dc55a789ee9cfb25aa243c3778ae8dabd5eeed7a
   branch: ksubrama/ruby23
   specs:
     omnibus-software (4.0.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index b71a60a938..0c90c65c7e 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -11,7 +11,7 @@ override "libyaml", version: "0.1.6"
 override "makedepend", version: "1.0.5"
 override "ncurses", version: "5.9"
 override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.1.8"
+override "ruby", version: "2.1.9"
 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"
diff --git a/version_policy.rb b/version_policy.rb
index d47c49fa18..24484aa4d5 100644
--- a/version_policy.rb
+++ b/version_policy.rb
@@ -32,7 +32,7 @@ OMNIBUS_OVERRIDES = {
   "makedepend" => "1.0.5",
   "ncurses" => "5.9",
   "pkg-config-lite" => "0.28-1",
-  "ruby" => "2.1.8",
+  "ruby" => "2.1.9",
   # Leave dev-kit pinned to 4.5 on 32-bit, because 4.7 is 20MB larger and we don't want
   # to unnecessarily make the client any fatter. (Since it's different between
   # 32 and 64, we have to do it in the project file still.)