##// END OF EJS Templates
ci: stop running with Python 2...
Martin von Zweigbergk -
r49144:5d83a40c default
parent child Browse files
Show More
@@ -5,7 +5,7 b' stages:'
5 5 image: registry.heptapod.net/mercurial/ci-images/mercurial-core:$HG_CI_IMAGE_TAG
6 6
7 7 variables:
8 PYTHON: python
8 PYTHON: python3
9 9 TEST_HGMODULEPOLICY: "allow"
10 10 HG_CI_IMAGE_TAG: "latest"
11 11 TEST_HGTESTS_ALLOW_NETIO: "0"
@@ -30,30 +30,17 b' variables:'
30 30 - echo "$RUNTEST_ARGS"
31 31 - HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS
32 32
33 checks-py2:
33 checks:
34 34 <<: *runtests
35 35 variables:
36 36 RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
37 37
38 checks-py3:
39 <<: *runtests
40 variables:
41 RUNTEST_ARGS: "--time --test-list /tmp/check-tests.txt"
42 PYTHON: python3
43
44 rust-cargo-test-py2: &rust_cargo_test
38 rust-cargo-test:
45 39 <<: *all
46 40 stage: tests
47 41 script:
48 - echo "python used, $PYTHON"
49 42 - make rust-tests
50 43
51 rust-cargo-test-py3:
52 stage: tests
53 <<: *rust_cargo_test
54 variables:
55 PYTHON: python3
56
57 44 phabricator-refresh:
58 45 stage: phabricator
59 46 variables:
@@ -67,71 +54,40 b' phabricator-refresh:'
67 54 ./contrib/phab-refresh-stack.sh --comment "$DEFAULT_COMMENT";
68 55 fi
69 56
70 test-py2:
57 test:
71 58 <<: *runtests
72 59 variables:
73 60 RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
74 61 TEST_HGMODULEPOLICY: "c"
75 62 TEST_HGTESTS_ALLOW_NETIO: "1"
76 63
77 test-py3:
78 <<: *runtests
79 variables:
80 RUNTEST_ARGS: " --no-rust --blacklist /tmp/check-tests.txt"
81 PYTHON: python3
82 TEST_HGMODULEPOLICY: "c"
83 TEST_HGTESTS_ALLOW_NETIO: "1"
84
85 test-py2-pure:
64 test-pure:
86 65 <<: *runtests
87 66 variables:
88 67 RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
89 68 TEST_HGMODULEPOLICY: "py"
90 69
91 test-py3-pure:
92 <<: *runtests
93 variables:
94 RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
95 PYTHON: python3
96 TEST_HGMODULEPOLICY: "py"
97
98 test-py2-rust:
70 test-rust:
99 71 <<: *runtests
100 72 variables:
101 73 HGWITHRUSTEXT: cpython
102 74 RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
103 75 TEST_HGMODULEPOLICY: "rust+c"
104 76
105 test-py3-rust:
106 <<: *runtests
107 variables:
108 HGWITHRUSTEXT: cpython
109 RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt"
110 PYTHON: python3
111 TEST_HGMODULEPOLICY: "rust+c"
112
113 test-py3-rhg:
77 test-rhg:
114 78 <<: *runtests
115 79 variables:
116 80 HGWITHRUSTEXT: cpython
117 81 RUNTEST_ARGS: "--rust --rhg --blacklist /tmp/check-tests.txt"
118 PYTHON: python3
119 82 TEST_HGMODULEPOLICY: "rust+c"
120 83
121 test-py2-chg:
84 test-chg:
122 85 <<: *runtests
123 86 variables:
124 87 RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
125 88 TEST_HGMODULEPOLICY: "c"
126 89
127 test-py3-chg:
128 <<: *runtests
129 variables:
130 PYTHON: python3
131 RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt --chg"
132 TEST_HGMODULEPOLICY: "c"
133
134 check-pytype-py3:
90 check-pytype:
135 91 extends: .runtests_template
136 92 before_script:
137 93 - hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no
@@ -142,7 +98,6 b' check-pytype-py3:'
142 98 variables:
143 99 RUNTEST_ARGS: " --allow-slow-tests tests/test-check-pytype.t"
144 100 HGTEST_SLOWTIMEOUT: "3600"
145 PYTHON: python3
146 101 TEST_HGMODULEPOLICY: "c"
147 102
148 103 # `sh.exe --login` sets a couple of extra environment variables that are defined
General Comments 0
You need to be logged in to leave comments. Login now