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

RE-enable cluster tests on CI

See merge request pleroma/pleroma!2743
This commit is contained in:
lain 2020-07-10 08:56:12 +00:00
commit 4d809144d8
2 changed files with 14 additions and 16 deletions

View File

@ -63,21 +63,19 @@ unit-testing:
- mix ecto.migrate - mix ecto.migrate
- mix coveralls --preload-modules - mix coveralls --preload-modules
# Removed to fix CI issue. In this early state it wasn't adding much value anyway. federated-testing:
# TODO Fix and reinstate federated testing stage: test
# federated-testing: cache: *testing_cache_policy
# stage: test services:
# cache: *testing_cache_policy - name: minibikini/postgres-with-rum:12
# services: alias: postgres
# - name: minibikini/postgres-with-rum:12 command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
# alias: postgres script:
# command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"] - mix deps.get
# script: - mix ecto.create
# - mix deps.get - mix ecto.migrate
# - mix ecto.create - epmd -daemon
# - mix ecto.migrate - mix test --trace --only federated
# - epmd -daemon
# - mix test --trace --only federated
unit-testing-rum: unit-testing-rum:
stage: test stage: test

View File

@ -97,7 +97,7 @@ defmodule Pleroma.Cluster do
silence_logger_warnings(fn -> silence_logger_warnings(fn ->
node_configs node_configs
|> Enum.map(&Task.async(fn -> start_slave(&1) end)) |> 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)
end end