diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c7e8291d81..ce1b69692d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,9 @@ variables: &global_variables MIX_ENV: test cache: &global_cache_policy - key: ${CI_COMMIT_REF_SLUG} + key: + files: + - mix.lock paths: - deps - _build @@ -59,7 +61,7 @@ benchmark: unit-testing: stage: test - retry: 2 + # retry: 2 cache: &testing_cache_policy <<: *global_cache_policy policy: pull @@ -91,24 +93,24 @@ unit-testing: # - epmd -daemon # - mix test --trace --only federated -unit-testing-rum: - stage: test - retry: 2 - 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"] - variables: - <<: *global_variables - RUM_ENABLED: "true" - script: - - apt-get update && apt-get install -y libimage-exiftool-perl ffmpeg - - mix deps.get - - mix ecto.create - - mix ecto.migrate - - "mix ecto.migrate --migrations-path priv/repo/optional_migrations/rum_indexing/" - - mix test --preload-modules +# unit-testing-rum: +# stage: test +# retry: 2 +# 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"] +# variables: +# <<: *global_variables +# RUM_ENABLED: "true" +# script: +# - apt-get update && apt-get install -y libimage-exiftool-perl ffmpeg +# - mix deps.get +# - mix ecto.create +# - mix ecto.migrate +# - "mix ecto.migrate --migrations-path priv/repo/optional_migrations/rum_indexing/" +# - mix test --preload-modules lint: stage: test @@ -175,8 +177,8 @@ spec-deploy: - apk add curl script: - curl -X POST -F"token=$API_DOCS_PIPELINE_TRIGGER" -F'ref=master' -F"variables[BRANCH]=$CI_COMMIT_REF_NAME" -F"variables[JOB_REF]=$CI_JOB_ID" https://git.pleroma.social/api/v4/projects/1130/trigger/pipeline - - + + stop_review_app: image: alpine:3.9 stage: deploy @@ -235,7 +237,7 @@ amd64-musl: stage: release artifacts: *release-artifacts only: *release-only - image: elixir:1.10.3-alpine + image: elixir:1.10.3-alpine cache: *release-cache variables: *release-variables before_script: &before-release-musl @@ -393,4 +395,4 @@ docker-adhoc: tags: - dind only: - - /^build-docker/.*$/@pleroma/pleroma \ No newline at end of file + - /^build-docker/.*$/@pleroma/pleroma diff --git a/test/pleroma/gun/connection_pool_test.exs b/test/pleroma/gun/connection_pool_test.exs index 4b31586256..6ccd944846 100644 --- a/test/pleroma/gun/connection_pool_test.exs +++ b/test/pleroma/gun/connection_pool_test.exs @@ -46,6 +46,8 @@ test "gives the same connection to 2 concurrent requests" do end end + @tag :skip + # https://git.pleroma.social/pleroma/pleroma/-/issues/2628 test "connection limit is respected with concurrent requests" do clear_config([:connections_pool, :max_connections]) do clear_config([:connections_pool, :max_connections], 1)