# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1575294240 -3600
# Node ID 3cd5e9b1d0398afdbc730ff6cd48a9bee45f9e81
# Parent  9f69164cdc1602ad281ba90adc54f496bdeb52f9# Parent  6b306af9f52a1c15ac8212113643883193e15473
test-compat: merge mercurial-4.8 into mercurial-4.7

diff -r 9f69164cdc16 -r 3cd5e9b1d039 .gitlab-ci.yml
--- a/.gitlab-ci.yml	Thu Nov 28 10:53:25 2019 +0100
+++ b/.gitlab-ci.yml	Mon Dec 02 14:44:00 2019 +0100
@@ -18,19 +18,3 @@
         - 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)