# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1729791712 -14400
# Node ID 701d4bb5d53c4b775d8cc9a748342e13455117a3
# Parent  241c4fec9723850d0a47a8bf3e2b686c03ba6d50# Parent  2bac0e2340e08e227520a15517d0404e4902e3aa
test-compat: merge mercurial-6.2 into mercurial-6.1

diff -r 2bac0e2340e0 -r 701d4bb5d53c .gitlab-ci.yml
--- a/.gitlab-ci.yml	Thu Oct 24 21:34:08 2024 +0400
+++ b/.gitlab-ci.yml	Thu Oct 24 21:41:52 2024 +0400
@@ -15,37 +15,61 @@
     when: manual
 
 variables:
+    PY: py3
     PYTHON: python3
     RUNTEST_ARGS: ""
     TEST_HGMODULEPOLICY: "allow"
 
 .runtests_template: &runtests
-    image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd
+    image: registry.heptapod.net/mercurial/ci-images/$PY-hgext3rd
     before_script:
         - (cd tests; ls -1 test-check-*.t > /tmp/check-tests.txt)
-        - echo test-doctest.py > /tmp/doctest.txt
+        - (cd tests; ls -1 test-check-sdist.t test-doctest.py > /tmp/compat-blacklist.txt)
     script:
         - *prepare_hg
-        - ("$PYTHON" --version)
-        - (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" /ci/repos/mercurial/tests/run-tests.py --color=always $RUNTEST_ARGS)
+        - ($PYTHON --version)
+        - (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" $PYTHON /ci/repos/mercurial/tests/run-tests.py --color=always $RUNTEST_ARGS)
+
+checks-py2:
+    <<: *runtests
+    variables:
+        PY: py2
+        PYTHON: prlimit --nofile=1024:1024 python2
+        RUNTEST_ARGS: "--test-list /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt"
+        CI_CLEVER_CLOUD_FLAVOR: S
 
 checks-py3:
     <<: *runtests
-    image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd
+    variables:
+        RUNTEST_ARGS: "--test-list /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt"
+        CI_CLEVER_CLOUD_FLAVOR: S
+
+tests-py2-cext:
+    <<: *runtests
     variables:
-        RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
-        CI_CLEVER_CLOUD_FLAVOR: S
+        PY: py2
+        PYTHON: prlimit --nofile=1024:1024 python2
+        RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt"
+        TEST_HGMODULEPOLICY: "c"
+
+tests-py2-pure:
+    <<: *runtests
+    variables:
+        PY: py2
+        PYTHON: prlimit --nofile=1024:1024 python2
+        RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt"
+        TEST_HGMODULEPOLICY: "py"
 
 tests-py3-cext:
     <<: *runtests
     variables:
-        RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt --blacklist /tmp/doctest.txt"
+        RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt"
         TEST_HGMODULEPOLICY: "c"
 
 tests-py3-pure:
     <<: *runtests
     variables:
-        RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt --blacklist /tmp/doctest.txt"
+        RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt"
         TEST_HGMODULEPOLICY: "py"
 
 .windows_runtests_template: &windows_runtests