diff .gitlab-ci.yml @ 6856:436dddbb3af5 stable

ci: copy CI image versions from default and run tests-py3-* on v2.1

--- a/.gitlab-ci.yml	Sun Oct 13 16:58:07 2024 +0400
+++ b/.gitlab-ci.yml	Tue Oct 15 21:36:16 2024 +0400
@@ -15,13 +15,12 @@
     when: manual
 
 variables:
-    PY: py3
     PYTHON: python3
     RUNTEST_ARGS: ""
     TEST_HGMODULEPOLICY: "allow"
 
 .runtests_template: &runtests
-    image: registry.heptapod.net/mercurial/ci-images/$PY-hgext3rd
+    image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd:v2.1
     before_script:
         - (cd tests; ls -1 test-check-*.t > /tmp/check-tests.txt)
     script:
@@ -31,8 +30,10 @@
 
 checks-py3:
     <<: *runtests
+    image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd:v2.0
     variables:
         RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
+        CI_CLEVER_CLOUD_FLAVOR: S
 
 tests-py3-cext:
     <<: *runtests
@@ -48,8 +49,8 @@
 
 tests-py2-6.1:
     <<: *runtests
+    image: registry.heptapod.net/mercurial/ci-images/py2-hgext3rd:v1.0
     variables:
-        PY: py2
         PYTHON: prlimit --nofile=1024:1024 python2
         RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "c"