--- a/.gitlab-ci.yml	Wed Oct 23 01:11:13 2019 +0200
+++ b/.gitlab-ci.yml	Thu Nov 28 10:48:44 2019 +0100
@@ -1,12 +1,36 @@
 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:
+        - hg pull -R /ci/repos/mercurial/
+        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
+        - hg -R /ci/repos/mercurial/ update "$hg_rev"
+        - (cd tests; /ci/repos/mercurial/tests/run-tests.py --color=always)
+
+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)
-        - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`
+        - hg pull -R /ci/repos/mercurial/
+        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
+        - hg -R /ci/repos/mercurial/ update "$hg_rev"
+        - (cd tests; /ci/repos/mercurial/tests/run-tests.py --color=always --pure)
+
+tests-py3-cext:
+    image: octobus/ci-py3-hgext3rd
+    script:
+        - hg pull -R /ci/repos/mercurial/
+        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
+        - hg -R /ci/repos/mercurial/ update "$hg_rev"
+        - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always)
+
+tests-py3-pure:
+    image: octobus/ci-py3-hgext3rd
+    script:
+        - hg pull -R /ci/repos/mercurial/
+        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
+        - hg -R /ci/repos/mercurial/ update "$hg_rev"
+        - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always --pure)