summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-10-07 15:34:35 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-10-07 15:35:49 +0100
commitc5eb8342b278d0a0268547c1e3a4f8c942321278 (patch)
tree86885a36c5f08ee74122918b25a958117c285ec6
parentUse mainline's merge_base_branch.sh (diff)
downloadsynapse-c5eb8342b278d0a0268547c1e3a4f8c942321278.tar.xz
Try adding workers to CircleCI instead
-rw-r--r--.circleci/config.yml18
1 files changed, 18 insertions, 0 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml

index 341395765d..ba316f7233 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml
@@ -13,6 +13,20 @@ jobs: destination: logs - store_test_results: path: /logs + sytestpy2postgresworkersmerged: + docker: + - image: matrixdotorg/sytest-synapse:dinsic + working_directory: /src + steps: + - checkout + - run: bash .circleci/merge_base_branch.sh + - run: POSTGRES=1 WORKERS=1 /synapse_sytest.sh + - store_artifacts: + path: /logs + destination: logs + - store_test_results: + path: /logs + workflows: version: 2 @@ -21,4 +35,8 @@ workflows: - sytestpy2postgresmerged: filters: branches: + ignore: /develop|master|release-.*/ + - sytestpy2postgresworkersmerged: + filters: + branches: ignore: /develop|master|release-.*/ \ No newline at end of file