--- a/.gitlab-ci.yml	Thu Nov 07 10:29:03 2019 +0100
+++ b/.gitlab-ci.yml	Fri Nov 15 10:59:47 2019 +0100
@@ -1,12 +1,44 @@
 flake8:
+    image: octobus/ci-py2-hgext3rd
+    script:
+        - hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' -X hgext3rd/evolve/thirdparty | xargs -0 flake8
+
+tests-py2-cext:
+    image: octobus/ci-py2-hgext3rd
     script:
-        - pip install --user flake8
-        - hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' -X hgext3rd/evolve/thirdparty | xargs -0 ~/.local/bin/flake8
-tests:
+        - echo $PWD
+        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`
+        - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/
+        - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'`
+        - (cd tests; /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py)
+        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`
+
+tests-py2-pure:
+    image: octobus/ci-py2-hgext3rd
     script:
         - echo $PWD
         - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`
         - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/
         - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'`
-        - (cd tests; /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py -j 3)
+        - (cd tests; /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py --pure)
+        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`
+
+tests-py3-cext:
+    image: octobus/ci-py3-hgext3rd
+    script:
+        - echo $PWD
         - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`
+        - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/
+        - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'`
+        - (cd tests; python3 /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py)
+        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`
+
+tests-py3-pure:
+    image: octobus/ci-py3-hgext3rd
+    script:
+        - echo $PWD
+        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`
+        - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/
+        - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'`
+        - (cd tests; python3 /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py --pure)
+        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`

--- a/README	Thu Nov 07 10:29:03 2019 +0100
+++ b/README	Fri Nov 15 10:59:47 2019 +0100
@@ -116,16 +116,17 @@
 
 .. _evolution: https://bz.mercurial-scm.org/buglist.cgi?component=evolution&query_format=advanced&resolution=---
 
-You can use the patchbomb extension to send email to `mercurial devel
-<https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel>`_. Please make
-sure to use the evolve-ext flag when doing so. You can use a command like
-this::
+The recommended way is to create Merge Request on
+https://dev.heptapod.net/mercurial/evolve. To do so, create an account and
+request access. You'll then be able to create topic based merge request.
+
+Alternatively, you can use the patchbomb extension to send email to `mercurial
+devel <https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel>`_.
+Please make sure to use the evolve-ext flag when doing so. You can use a
+command like this::
 
     $ hg email --to mercurial-devel@mercurial-scm.org --flag evolve-ext --rev '<your patches>'
 
-Some of development happens on a public bitbucket repository (`evolve-devel`_) using the topic extension.
-
-.. _`evolve-devel`: https://bitbucket.org/octobus/evolve-devel
 
 For guidelines on the patch description, see the `official Mercurial guideline`_.