diff .gitlab-ci.yml @ 6920:df546ef8d75f mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0

--- a/.gitlab-ci.yml	Thu Jun 27 09:03:55 2024 +0400
+++ b/.gitlab-ci.yml	Fri Oct 25 18:11:50 2024 +0400
@@ -1,6 +1,6 @@
 .prepare_hg: &prepare_hg
     - hg pull -R /ci/repos/mercurial/ https://repo.mercurial-scm.org/hg
-    - hg_branch=${HG_BRANCH:-$(tests/testlib/map-hg-rev.sh "$(hg identify --branch)")}
+    - hg_branch=${HG_BRANCH:-$(tests/testlib/map-hg-rev.sh $CI_COMMIT_HG_BRANCH)}
     - hg -R /ci/repos/mercurial/ update "$hg_branch"
     - hg_rev=$(hg log -R /ci/repos/mercurial/ -r . -T '{node}')
     - echo testing with mercurial branch="$hg_branch", revision="$hg_rev"
@@ -24,6 +24,7 @@
     image: registry.heptapod.net/mercurial/ci-images/$PY-hgext3rd
     before_script:
         - (cd tests; ls -1 test-check-*.t > /tmp/check-tests.txt)
+        - (cd tests; ls -1 test-check-sdist.t test-doctest.py > /tmp/compat-blacklist.txt)
     script:
         - *prepare_hg
         - ($PYTHON --version)
@@ -34,14 +35,15 @@
     variables:
         PY: py2
         PYTHON: prlimit --nofile=1024:1024 python2
-        RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
+        RUNTEST_ARGS: "--test-list /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt"
+        CI_CLEVER_CLOUD_FLAVOR: S
 
 tests-py2-cext:
     <<: *runtests
     variables:
         PY: py2
         PYTHON: prlimit --nofile=1024:1024 python2
-        RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt"
+        RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt"
         TEST_HGMODULEPOLICY: "c"
 
 tests-py2-pure:
@@ -49,5 +51,5 @@
     variables:
         PY: py2
         PYTHON: prlimit --nofile=1024:1024 python2
-        RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
+        RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt --blacklist /tmp/compat-blacklist.txt"
         TEST_HGMODULEPOLICY: "py"