diff options
| -rw-r--r-- | .travis.yml | 44 | ||||
| -rw-r--r-- | tasks/rspec.rb | 2 |
2 files changed, 38 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index 3eeab89a6e..fd8f8d33f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ before_script: - echo --color > .rspec - echo -fp >> .rspec # necessary for sudo: true tests, ingore failures on tests invoked with sudo: false - - sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers || true + - sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers # do not run expensive spec tests on PRs, only on branches branches: @@ -31,15 +31,45 @@ env: matrix: include: - - rvm: 2.3.5 + - env: + INTEGRATION_SPECS_23: 1 + rvm: 2.3.5 sudo: true - script: sudo -E $(which bundle) exec rake spec; - # also remove integration / external tests + script: sudo -E $(which bundle) exec rake spec:integration; bundler_args: --without ci docgen guard integration maintenance omnibus_package --frozen - - rvm: 2.4.2 + - env: + INTEGRATION_SPECS_24: 1 + rvm: 2.4.2 sudo: true - script: sudo -E $(which bundle) exec rake spec; - # also remove integration / external tests + 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.2 + sudo: true + 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.2 + 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: CHEFSTYLE: 1 diff --git a/tasks/rspec.rb b/tasks/rspec.rb index 616a68f09e..848c50eb40 100644 --- a/tasks/rspec.rb +++ b/tasks/rspec.rb @@ -25,7 +25,7 @@ CHEF_ROOT = File.join(File.dirname(__FILE__), "..") begin require "rspec/core/rake_task" - desc "Run specs for Chef's Components" + desc "Run specs for Chef's Components (chef-config)" task :component_specs do Dir.chdir("chef-config") do Bundler.with_clean_env do |