changeset 5369:2295818ec738

ci: replace flake8 job by checks-py{2,3} (with more than flake8)
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 07 Jun 2020 18:38:22 +0800
parents bbd1e2f4e7a1
children 06b5e43ac29c
files .gitlab-ci.yml
diffstat 1 files changed, 18 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/.gitlab-ci.yml	Wed Jul 08 18:07:53 2020 +0200
+++ b/.gitlab-ci.yml	Sun Jun 07 18:38:22 2020 +0800
@@ -1,8 +1,3 @@
-flake8:
-    image: octobus/ci-py2-hgext3rd
-    script:
-        - hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' -X hgext3rd/evolve/thirdparty | xargs -0 flake8
-
 pytype:
     image: octobus/ci-py3-hgext3rd
     script:
@@ -21,6 +16,8 @@
 
 .runtests_template: &runtests
     image: octobus/ci-$PY-hgext3rd
+    before_script:
+        - (cd tests; ls -1 test-check-*.t > /tmp/check-tests.txt)
     script:
         - hg pull -R /ci/repos/mercurial/
         - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
@@ -28,16 +25,28 @@
         - ("$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:
+        RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
+
+checks-py3:
+    <<: *runtests
+    variables:
+        PY: py3
+        PYTHON: python3
+        RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
+
 tests-py2-cext:
     <<: *runtests
     variables:
-        RUNTEST_ARGS: "--no-rust"
+        RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "c"
 
 tests-py2-pure:
     <<: *runtests
     variables:
-        RUNTEST_ARGS: "--pure"
+        RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "py"
 
 tests-py3-cext:
@@ -45,7 +54,7 @@
     variables:
         PY: py3
         PYTHON: python3
-        RUNTEST_ARGS: "--no-rust"
+        RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "c"
 
 tests-py3-pure:
@@ -53,7 +62,7 @@
     variables:
         PY: py3
         PYTHON: python3
-        RUNTEST_ARGS: "--pure"
+        RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "py"
 
 doc: