pleroma

commit: 4d809144d84c743efbabeb2ca85f34f360a61b1e
parent 5ea638757210c34b40fb568e537082b78f4118a6
Author: lain <lain@soykaf.club>
Date:   Fri, 10 Jul 2020 08:56:12 +0000

Merge branch 'cluster-test-ci' into 'develop'

RE-enable cluster tests on CI

See merge request pleroma/pleroma!2743
Diffstat:
M
.gitlab-ci.yml
28
+++++++++++++---------------
M
test/support/cluster.ex
2
+-

2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -63,21 +63,19 @@ unit-testing:
     - mix ecto.migrate
     - mix coveralls --preload-modules
 
-# Removed to fix CI issue. In this early state it wasn't adding much value anyway.
-# TODO Fix and reinstate federated testing
-# federated-testing:
-#   stage: test
-#   cache: *testing_cache_policy
-#   services:
-#   - name: minibikini/postgres-with-rum:12
-#     alias: postgres
-#     command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
-#   script:
-#     - mix deps.get
-#     - mix ecto.create
-#     - mix ecto.migrate
-#     - epmd -daemon
-#     - mix test --trace --only federated
+federated-testing:
+  stage: test
+  cache: *testing_cache_policy
+  services:
+  - name: minibikini/postgres-with-rum:12
+    alias: postgres
+    command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
+  script:
+    - mix deps.get
+    - mix ecto.create
+    - mix ecto.migrate
+    - epmd -daemon
+    - mix test --trace --only federated
 
 unit-testing-rum:
   stage: test
diff --git a/test/support/cluster.ex b/test/support/cluster.ex
@@ -97,7 +97,7 @@ defmodule Pleroma.Cluster do
     silence_logger_warnings(fn ->
       node_configs
       |> Enum.map(&Task.async(fn -> start_slave(&1) end))
-      |> Enum.map(&Task.await(&1, 60_000))
+      |> Enum.map(&Task.await(&1, 90_000))
     end)
   end