diff --git a/bundler.d/test.rb b/bundler.d/test.rb index 45a3d2b09..8b9337e1a 100644 --- a/bundler.d/test.rb +++ b/bundler.d/test.rb @@ -8,7 +8,6 @@ gem 'rubocop-performance', '~> 1.5.2' gem 'rack-test' gem 'rake' - gem 'rubocop-checkstyle_formatter', '~> 0.2' gem 'rubocop-rake' gem 'webmock' diff --git a/tasks/jenkins.rake b/tasks/jenkins.rake index b6e000193..e2ee5a07c 100644 --- a/tasks/jenkins.rake +++ b/tasks/jenkins.rake @@ -1,28 +1,5 @@ -require 'English' - -begin - require "ci/reporter/rake/test_unit" - namespace :jenkins do - task :unit => ["jenkins:setup:test_unit", 'rake:test'] - - namespace :setup do - task :pre_ci do - ENV["CI_REPORTS"] = 'jenkins/reports/unit/' - gem 'ci_reporter' - end - task :minitest => [:pre_ci, "ci:setup:minitest"] - task :test_unit => [:pre_ci, "ci:setup:testunit"] - end - - task :rubocop do - system("bundle exec rubocop \ - --require rubocop/formatter/checkstyle_formatter \ - --format progress \ - --format RuboCop::Formatter::CheckstyleFormatter \ - --no-color --out rubocop.xml") - exit($CHILD_STATUS.exitstatus) - end - end -rescue LoadError - # ci/reporter/rake/rspec not present, skipping this definition +require "ci/reporter/rake/test_unit" +namespace :jenkins do + desc 'Sets up CI environment for testing and run tests' + task :unit => ['ci:setup:testunit', 'rake:test'] end