From 07c29f306696806271750a9492a5f8f2c88b2a15 Mon Sep 17 00:00:00 2001 From: Alan Guo Xiang Tan Date: Tue, 12 Sep 2023 09:45:49 +0800 Subject: [PATCH] Revert "DEV: Run core system tests by default in docker test image (#23517)" (#23525) This reverts commit 40acb9a111057b9e27e36172d1390d0c927777dd. Reverting because test runs are breaking due to this change --- lib/tasks/docker.rake | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake index 70bd01e8f76..f1caf3adbf7 100644 --- a/lib/tasks/docker.rake +++ b/lib/tasks/docker.rake @@ -224,16 +224,17 @@ task "docker:test" do params << "--seed #{ENV["RSPEC_SEED"]}" if ENV["RSPEC_SEED"] end - @good &&= run_or_fail("bin/ember-cli --build") - if ENV["USE_TURBO"] @good &&= - run_or_fail( - "bundle exec ./bin/turbo_rspec --enable-system-tests --verbose #{params.join(" ")}".strip, - ) + run_or_fail("bundle exec ./bin/turbo_rspec --verbose #{params.join(" ")}".strip) else @good &&= run_or_fail("bundle exec rspec #{params.join(" ")}".strip) end + + if ENV["RUN_SYSTEM_TESTS"] + @good &&= run_or_fail("bin/ember-cli --build") + @good &&= run_or_fail("timeout --verbose 1800 bundle exec rspec spec/system") + end end unless ENV["SKIP_PLUGINS"]