start branch for 14

Signed-off-by: Thom May <thom@chef.io>

3 files changed, 16 insertions, 36 deletions

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 2487aa5bab..8a856ee5ba 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -34,6 +34,8 @@ github:
   # for building.
   release_branch:
     - master:
+        version_constraint: 14.*
+    - chef-13:
         version_constraint: 13.*
     - chef-12:
         version_constraint: 12.*
diff --git a/.travis.yml b/.travis.yml
index 2b3b582694..80695c09e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ before_script:
 branches:
   only:
   - master
+  - chef-13
   - chef-12
 
 env:
@@ -31,12 +32,6 @@ env:
 matrix:
   include:
   - env:
-      INTEGRATION_SPECS_23: 1
-    rvm: 2.3.5
-    sudo: true
-    script: sudo -E $(which bundle) exec rake spec:integration;
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
-  - env:
       INTEGRATION_SPECS_24: 1
     rvm: 2.4.3
     sudo: true
@@ -49,12 +44,6 @@ matrix:
     script: sudo -E $(which bundle) exec rake spec:integration;
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
   - env:
-      FUNCTIONAL_SPECS_23: 1
-    rvm: 2.3.5
-    sudo: true
-    script: sudo -E $(which bundle) exec rake spec:functional;
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
-  - env:
       FUNCTIONAL_SPECS_24: 1
     rvm: 2.4.3
     sudo: true
@@ -67,14 +56,6 @@ matrix:
     script: sudo -E $(which bundle) exec rake spec:functional;
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
   - env:
-      UNIT_SPECS_23: 1
-    rvm: 2.3.5
-    sudo: true
-    script:
-      - sudo -E $(which bundle) exec rake spec:unit;
-      - sudo -E $(which bundle) exec rake component_specs
-    bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
-  - env:
       UNIT_SPECS_24: 1
     rvm: 2.4.3
     sudo: true
@@ -92,13 +73,13 @@ matrix:
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
   - env:
       CHEFSTYLE: 1
-    rvm: 2.4.3
+    rvm: 2.5.0
     script: bundle exec rake style
     # also remove integration / external tests
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
   - env:
       AUDIT_CHECK: 1
-    rvm: 2.4.3
+    rvm: 2.5.0
     script: bundle exec bundle-audit check --update
     # also remove integration / external tests
     bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen
@@ -108,40 +89,40 @@ matrix:
   - env:
       TEST_GEM: sethvargo/chef-sugar
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       PEDANT_OPTS: --skip-oc_id
       TEST_GEM: chef/chef-zero
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec cheffs
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: chef/cheffish
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: chefspec/chefspec
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: foodcritic/foodcritic
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake test
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: poise/halite
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: chef/knife-windows
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: poise/poise
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake spec
-    rvm: 2.4.3
+    rvm: 2.5.0
   - env:
       TEST_GEM: chef/knife-windows
     script: bundle exec tasks/bin/run_external_test $TEST_GEM master rake unit_spec
-    rvm: 2.4.3
+    rvm: 2.5.0
   ### START TEST KITCHEN ONLY ###
   #
   - rvm: 2.4.3
@@ -349,7 +330,7 @@ matrix:
 #      - AWESOME_CUSTOMERS_RHEL=1
 #      - KITCHEN_YAML=.kitchen.travis.yml
 #    ### END TEST KITCHEN ONLY ###
-  - rvm: 2.4.3
+  - rvm: 2.5.0
     sudo: required
     before_install:
       - gem update --system $(grep rubygems omnibus_overrides.rb | cut -d'"' -f2)
@@ -373,6 +354,3 @@ notifications:
   on_failure: true
   on_success: change
   on_pull_requests: false
-  irc:
-    channels:
-    - chat.freenode.net#chef-hacking
diff --git a/VERSION b/VERSION
index 2ad6de81a4..4b964e9654 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-13.7.16
\ No newline at end of file
+14.0.0