summary refs log tree commit diff
path: root/.circleci
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-09-14 03:11:11 +1000
committerGitHub <noreply@github.com>2018-09-14 03:11:11 +1000
commit7c27c4d51cfd2a3d6504889b1ccdddabf38ae05c (patch)
tree1b3523ee1e3e68f0ab4ca66c160562252641da0b /.circleci
parentMerge pull request #3856 from matrix-org/erikj/speed_up_purge (diff)
downloadsynapse-7c27c4d51cfd2a3d6504889b1ccdddabf38ae05c.tar.xz
merge (#3576)
Diffstat (limited to '.circleci')
-rw-r--r--.circleci/config.yml17
1 files changed, 12 insertions, 5 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5266544f3c..605430fb3f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,7 +53,7 @@ jobs:
     steps:
       - checkout
       - run: docker pull matrixdotorg/sytest-synapsepy3
-      - run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs hawkowl/sytestpy3
+      - run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs matrixdotorg/sytest-synapsepy3
       - store_artifacts:
           path: ~/project/logs
           destination: logs
@@ -76,7 +76,7 @@ jobs:
       - checkout
       - run: bash .circleci/merge_base_branch.sh
       - run: docker pull matrixdotorg/sytest-synapsepy3
-      - run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs hawkowl/sytestpy3
+      - run: docker run --rm -it -v $(pwd)\:/src -v $(pwd)/logs\:/logs matrixdotorg/sytest-synapsepy3
       - store_artifacts:
           path: ~/project/logs
           destination: logs
@@ -101,6 +101,8 @@ workflows:
     jobs:
       - sytestpy2
       - sytestpy2postgres
+      - sytestpy3
+      - sytestpy3postgres
       - sytestpy2merged:
           filters:
             branches:
@@ -109,6 +111,11 @@ workflows:
           filters:
             branches:
               ignore: /develop|master/
-# Currently broken while the Python 3 port is incomplete
-#      - sytestpy3
-#      - sytestpy3postgres
+      - sytestpy3merged:
+          filters:
+            branches:
+              ignore: /develop|master/
+      - sytestpy3postgresmerged:
+          filters:
+            branches:
+              ignore: /develop|master/