diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake index 6a7088dfd38..a92c5529ed7 100644 --- a/lib/tasks/docker.rake +++ b/lib/tasks/docker.rake @@ -39,6 +39,7 @@ task 'docker:test' do begin @good = true unless ENV['SKIP_LINT'] + puts "travis_fold:start:lint" if ENV["TRAVIS"] puts "Running linters/prettyfiers" puts "eslint #{`yarn eslint -v`}" puts "prettier #{`yarn prettier -v`}" @@ -64,9 +65,11 @@ task 'docker:test' do @good &&= run_or_fail('yarn prettier --list-different "plugins/**/*.scss" "plugins/**/*.es6"') end end + puts "travis_fold:end:lint" if ENV["TRAVIS"] end unless ENV['SKIP_TESTS'] + puts "travis_fold:start:prepare_tests" if ENV["TRAVIS"] puts "Cleaning up old test tmp data in tmp/test_data" `rm -fr tmp/test_data && mkdir -p tmp/test_data/redis && mkdir tmp/test_data/pg` @@ -94,8 +97,10 @@ task 'docker:test' do @good &&= run_or_fail("bundle exec rake db:migrate") - unless ENV["JS_ONLY"] + puts "travis_fold:end:prepare_tests" if ENV["TRAVIS"] + unless ENV["JS_ONLY"] + puts "travis_fold:start:ruby_tests" if ENV["TRAVIS"] unless ENV["SKIP_CORE"] params = [] if ENV["BISECT"] @@ -114,10 +119,11 @@ task 'docker:test' do @good &&= run_or_fail("bundle exec rake plugin:spec") end end - + puts "travis_fold:end:ruby_tests" if ENV["TRAVIS"] end unless ENV["RUBY_ONLY"] + puts "travis_fold:start:js_tests" if ENV["TRAVIS"] unless ENV["SKIP_CORE"] @good &&= run_or_fail("bundle exec rake qunit:test['600000']") @good &&= run_or_fail("bundle exec rake qunit:test['600000','/wizard/qunit']") @@ -130,7 +136,7 @@ task 'docker:test' do @good &&= run_or_fail("bundle exec rake plugin:qunit['*','600000']") end end - + puts "travis_fold:end:js_tests" if ENV["TRAVIS"] end end diff --git a/script/docker_test.rb b/script/docker_test.rb index cb3a3bf5230..a8f3a1cf45f 100644 --- a/script/docker_test.rb +++ b/script/docker_test.rb @@ -6,6 +6,8 @@ # => RUN_SMOKE_TESTS executes the smoke tests instead of the regular tests from docker.rake # See lib/tasks/docker.rake and lib/tasks/smoke_test.rake for more information +puts "travis_fold:end:starting_docker_container" if ENV["TRAVIS"] + def run_or_fail(command) pid = Process.spawn(command) Process.wait(pid) @@ -13,11 +15,18 @@ def run_or_fail(command) end unless ENV['NO_UPDATE'] + puts "travis_fold:start:pulling_latest_discourse" if ENV["TRAVIS"] run_or_fail("git pull") checkout = ENV['COMMIT_HASH'] || "HEAD" run_or_fail("git checkout #{checkout}") + + puts "travis_fold:end:pulling_latest_discourse" if ENV["TRAVIS"] + puts "travis_fold:start:bundle" if ENV["TRAVIS"] + run_or_fail("bundle") + + puts "travis_fold:end:bundle" if ENV["TRAVIS"] end if ENV['RUN_SMOKE_TESTS']