summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.circleci/config.yml38
1 files changed, 34 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml

index 027b82e1cf..86f9fa9372 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml
@@ -7,10 +7,6 @@ jobs: steps: - checkout - run: bash .circleci/merge_base_branch.sh - - run: pwd - - run: ls - - run: ls / - - run: ls jenkins - run: POSTGRES=1 /synapse_sytest.sh - store_artifacts: path: /logs @@ -30,6 +26,32 @@ jobs: destination: logs - store_test_results: path: /logs + sytestpy3postgresmerged: + docker: + - image: matrixdotorg/sytest-synapse:dinsic + working_directory: /src + steps: + - checkout + - run: bash .circleci/merge_base_branch.sh + - run: POSTGRES=1 /synapse_sytest.sh + - store_artifacts: + path: /logs + destination: logs + - store_test_results: + path: /logs + sytestpy3postgresworkersmerged: + 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: @@ -43,4 +65,12 @@ workflows: - sytestpy2postgresworkersmerged: filters: branches: + ignore: /develop|master|release-.*/ + - sytestpy3postgresmerged: + filters: + branches: + ignore: /develop|master|release-.*/ + - sytestpy3postgresworkersmerged: + filters: + branches: ignore: /develop|master|release-.*/ \ No newline at end of file