Mercurial > public > mercurial-scm > hg-stable

changeset 48899:db023e33b652

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge stable into default
author Rapha?l Gom?s <rgomes@octobus.net>
date Tue, 01 Mar 2022 16:44:59 +0100
parents f835f6a4ee9a (diff) 1ceca11e6546 (current diff)
children 1d5fd9def5ac
files
diffstat 1 files changed, 1 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/heptapod-ci.yml	Tue Mar 01 16:39:14 2022 +0100
+++ b/contrib/heptapod-ci.yml	Tue Mar 01 16:44:59 2022 +0100
@@ -30,27 +30,17 @@
         - echo "$RUNTEST_ARGS"
         - HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS
 
-checks-py2:
-    <<: *runtests
-    variables:
-        RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
-
 checks-py3:
     <<: *runtests
     variables:
         RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
         PYTHON: python3
 
-rust-cargo-test-py2: &rust_cargo_test
-    <<: *all
+rust-cargo-test-py3:
     stage: tests
     script:
         - echo "python used, $PYTHON"
         - make rust-tests
-
-rust-cargo-test-py3:
-    stage: tests
-    <<: *rust_cargo_test
     variables:
         PYTHON: python3
 
@@ -72,13 +62,6 @@
             ./contrib/phab-refresh-stack.sh --comment "$DEFAULT_COMMENT";
         fi
 
-test-py2:
-    <<: *runtests
-    variables:
-        RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
-        TEST_HGMODULEPOLICY: "c"
-        TEST_HGTESTS_ALLOW_NETIO: "1"
-
 test-py3:
     <<: *runtests
     variables:
@@ -87,12 +70,6 @@
         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-py3-pure:
     <<: *runtests
     variables:
@@ -100,13 +77,6 @@
         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-py3-rust:
     <<: *runtests
     variables:
@@ -123,12 +93,6 @@
         PYTHON: python3
         TEST_HGMODULEPOLICY: "rust+c"
 
-test-py2-chg:
-    <<: *runtests
-    variables:
-        RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
-        TEST_HGMODULEPOLICY: "c"
-
 test-py3-chg:
     <<: *runtests
     variables: