Misc testing updates

Signed-off-by: Tim Smith <tsmith@chef.io>

4 files changed, 27 insertions, 11 deletions

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 327cb820..d1a9640a 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -8,8 +8,13 @@ rubygems:
   - ohai
 
 github:
+  # This deletes the GitHub PR branch after successfully merged into the release branch
+  delete_branch_on_merge: true
   # The tag format to use (e.g. v1.0.0)
   version_tag_format: "v{{version}}"
+  # allow bumping the minor release via label
+  minor_bump_labels:
+    - "Expeditor: Bump Minor Version"
   # Which Github branches to build Omnibus releases from, and what versions
   # (as determined by the value in the VERSION file) those branches are responsible
   # for building.
@@ -18,26 +23,22 @@ github:
         version_constraint: 14.*
     - 13-stable:
         version_constraint: 13.*
-    - 8-stable:
-        version_constraint: 8.*
 
 promote:
-  action:
-    - built_in:publish_rubygems
+  actions:
     - built_in:rollover_changelog
+    - built_in:publish_rubygems
 
 # These actions are taken, in order they are specified, anytime a Pull Request is merged.
 merge_actions:
   - built_in:bump_version:
       ignore_labels:
-        - "Version: Skip Bump"
         - "Expeditor: Skip Version Bump"
         - "Expeditor: Skip All"
   - bash:.expeditor/update_version.sh:
       only_if: built_in:bump_version
   - built_in:update_changelog:
       ignore_labels:
-        - "Meta: Exclude From Changelog"
         - "Expeditor: Exclude From Changelog"
         - "Expeditor: Skip All"
   - built_in:build_gem:
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 59c6d932..421f226f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1,4 @@
-* @chef/client-maintainers
+*                 @chef/client-maintainers
+.expeditor/**     @chef/jex-team
+README.md         @chef/docs-team
+RELEASE_NOTES.md  @chef/docs-team
diff --git a/.travis.yml b/.travis.yml
index 3d21fcc3..034cf72d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 language: ruby
 cache: bundler
-dist: trusty
 
 sudo: false
 
@@ -9,6 +8,8 @@ branches:
     - master
     - 13-stable
 
+bundler_args: --jobs 7 --without docs debug
+
 before_install:
   - gem --version
   - rvm @global do gem uninstall bundler -a -x -I || true
@@ -26,6 +27,6 @@ matrix:
     - rvm: ruby-head
 
 script:
-  - bundle exec chefstyle
-  - bundle exec rake spec
+  - bundle exec chefstyle -v
+  - bundle exec rake
   - bundle exec ohai
diff --git a/appveyor.yml b/appveyor.yml
index d10cf7be..0883b614 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -10,6 +10,17 @@ environment:
 
 clone_folder: c:\projects\ohai
 clone_depth: 1
+
+skip_commits:
+  # version bumps by Expeditor happen as a separate commit after the merge, we can skip
+  author: Chef Expeditor
+  # if ONLY the files listed below are changed in a commit, skip
+  files:
+    - MAINTAINERS.md
+    - MAINTAINERS.toml
+    - CHANGELOG.md
+    - RELEASE_NOTES.md
+
 skip_tags: true
 branches:
   only:
@@ -24,7 +35,7 @@ install:
   - bundler --version
 
 build_script:
-  - bundle install
+  - bundle install || bundle install || bundle install
 
 test_script:
   - bundle exec rspec