Merge branch 'enable-erratic' into 'develop'

Enable erratic tests

See merge request pleroma/pleroma!4155

3 files changed, 1 insertions, 15 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2fa519291..9e471eb38 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -151,20 +151,6 @@ unit-testing-1.15.8-otp-26:
   services: *testing_services
   script: *testing_script
 
-unit-testing-1.13.4-otp-25-erratic:
-  extends:
-  - .build_changes_policy
-  - .using-ci-base
-  stage: test
-  retry: 2
-  allow_failure: true
-  cache: *testing_cache_policy
-  services: *testing_services
-  script:
-    - mix ecto.create
-    - mix ecto.migrate
-    - mix pleroma.test_runner --only=erratic
-
 formatting-1.15:
   extends: .build_changes_policy
   image: &formatting_elixir elixir:1.15-alpine
diff --git a/changelog.d/ci-erratic.skip b/changelog.d/ci-erratic.skip
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/changelog.d/ci-erratic.skip
diff --git a/test/test_helper.exs b/test/test_helper.exs
index 4033631eb..fed7ce8a7 100644
--- a/test/test_helper.exs
+++ b/test/test_helper.exs
@@ -6,7 +6,7 @@ Code.put_compiler_option(:warnings_as_errors, true)
 
 ExUnit.configure(capture_log: true, max_cases: System.schedulers_online())
 
-ExUnit.start(exclude: [:federated, :erratic])
+ExUnit.start(exclude: [:federated])
 
 if match?({:unix, :darwin}, :os.type()) do
   excluded = ExUnit.configuration() |> Keyword.get(:exclude, [])