[Updated] D11757: backout: backout 5d83a40cd3f8 and re-instate Python 2 support

[Alphare (Raphaël Gomès)]

Closed by commit rHG645ae3ee63f9: backout: backout 5d83a40cd3f8 and re-instate Python 2 support (authored by Alphare).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D11757?vs=31070&id=31076

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D11757/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D11757

AFFECTED FILES
  contrib/heptapod-ci.yml

CHANGE DETAILS

diff --git a/contrib/heptapod-ci.yml b/contrib/heptapod-ci.yml
--- a/contrib/heptapod-ci.yml
+++ b/contrib/heptapod-ci.yml
@@ -5,7 +5,7 @@
 image: registry.heptapod.net/mercurial/ci-images/mercurial-core:$HG_CI_IMAGE_TAG
 
 variables:
-    PYTHON: python3
+    PYTHON: python
     TEST_HGMODULEPOLICY: "allow"
     HG_CI_IMAGE_TAG: "latest"
     TEST_HGTESTS_ALLOW_NETIO: "0"
@@ -30,17 +30,30 @@
         - echo "$RUNTEST_ARGS"
         - HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS
 
-checks:
+checks-py2:
     <<: *runtests
     variables:
         RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
 
-rust-cargo-test:
+checks-py3:
+    <<: *runtests
+    variables:
+        RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
+        PYTHON: python3
+
+rust-cargo-test-py2: &rust_cargo_test
     <<: *all
     stage: tests
     script:
+        - echo "python used, $PYTHON"
         - make rust-tests
 
+rust-cargo-test-py3:
+    stage: tests
+    <<: *rust_cargo_test
+    variables:
+        PYTHON: python3
+
 phabricator-refresh:
     stage: phabricator
     variables:
@@ -54,40 +67,71 @@
             ./contrib/phab-refresh-stack.sh --comment "$DEFAULT_COMMENT";
         fi
 
-test:
+test-py2:
     <<: *runtests
     variables:
         RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "c"
         TEST_HGTESTS_ALLOW_NETIO: "1"
 
-test-pure:
+test-py3:
+    <<: *runtests
+    variables:
+        RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
+        PYTHON: python3
+        TEST_HGMODULEPOLICY: "c"
+        TEST_HGTESTS_ALLOW_NETIO: "1"
+
+test-py2-pure:
     <<: *runtests
     variables:
         RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "py"
 
-test-rust:
+test-py3-pure:
+    <<: *runtests
+    variables:
+        RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
+        PYTHON: python3
+        TEST_HGMODULEPOLICY: "py"
+
+test-py2-rust:
     <<: *runtests
     variables:
         HGWITHRUSTEXT: cpython
         RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "rust+c"
 
-test-rhg:
+test-py3-rust:
+    <<: *runtests
+    variables:
+        HGWITHRUSTEXT: cpython
+        RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
+        PYTHON: python3
+        TEST_HGMODULEPOLICY: "rust+c"
+
+test-py3-rhg:
     <<: *runtests
     variables:
         HGWITHRUSTEXT: cpython
         RUNTEST_ARGS: "--rust --rhg --blacklist /tmp/check-tests.txt"
+        PYTHON: python3
         TEST_HGMODULEPOLICY: "rust+c"
 
-test-chg:
+test-py2-chg:
     <<: *runtests
     variables:
         RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
         TEST_HGMODULEPOLICY: "c"
 
-check-pytype:
+test-py3-chg:
+    <<: *runtests
+    variables:
+        PYTHON: python3
+        RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
+        TEST_HGMODULEPOLICY: "c"
+
+check-pytype-py3:
     extends: .runtests_template
     before_script:
       - hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no
@@ -98,6 +142,7 @@
     variables:
         RUNTEST_ARGS: " --allow-slow-tests tests/test-check-pytype.t"
         HGTEST_SLOWTIMEOUT: "3600"
+        PYTHON: python3
         TEST_HGMODULEPOLICY: "c"
 
 # `sh.exe --login` sets a couple of extra environment variables that are defined



To: Alphare, #hg-reviewers
Cc: durin42, martinvonz, indygreg, mercurial-patches
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-patches/attachments/20211115/b8b56be9/attachment-0002.html>