@@ -182,66 +182,45 @@ jobs:
182182 path : test-logs.txt
183183 destination : test-logs
184184 test_jest_windows_with_docker :
185- << : *windows_medium
186- parallelism : 2 # Run tests across 2 containers
185+ << : *windows_big
187186 steps :
188187 - run :
189188 name : Start Docker pull
190- command : |
191- if [ "$CIRCLE_NODE_INDEX" = "0" ]; then
192- docker pull python@sha256:1f92d35b567363820d0f2f37c7ccf2c1543e2d852cea01edb027039e6aef25e6
193- fi
189+ command : docker pull python@sha256:1f92d35b567363820d0f2f37c7ccf2c1543e2d852cea01edb027039e6aef25e6
194190 background : true
195191 - checkout
196192 - install_node_npm :
197193 node_version : << parameters.node_version >>
198194
199195 - setup_npm_user
200- - run : npm ci --loglevel verbose
201- # make docker appear to be broken.
196+ - run : npm ci
202197 - run :
203198 name : Install JUnit coverage reporter
204199 command : npm install --no-save jest-junit
205200 - run :
206201 name : Run Windows tests in parallel
207- command : |
208- # Run different tests based on parallel instance
209- if [ "$CIRCLE_NODE_INDEX" = "0" ]; then
210- # Instance 0: Run only the slow Python test
211- echo "Running plugin.spec.ts on instance 0..."
212- npm run test-jest-windows -- test/windows/plugin.spec.ts --reporters=default --reporters=jest-junit
213- else
214- # Instance 1: Run all other tests
215- echo "Running all other tests on instance 1..."
216- # Get all test files except plugin.spec.ts
217- TESTS=$(find test/windows -name "*.spec.ts" -not -name "plugin.spec.ts" | tr '\n' ' ')
218- npm run test-jest-windows -- $TESTS --reporters=default --reporters=jest-junit
219- fi
202+ command : npm run test-jest-windows --reporters=default --reporters=jest-junit
220203 environment :
221204 JEST_JUNIT_OUTPUT_DIR : ' ./reports/junit'
222205 JEST_JUNIT_ADD_FILE_ATTRIBUTE : ' true' # We need this to make --split-by=timings work
223206 - store_test_results :
224207 path : reports
225208 test_jest_windows_no_docker :
226- << : *windows_medium
227- parallelism : 2 # Run tests across 2 containers
209+ << : *windows_big
228210 steps :
229211 - checkout
230212 - install_node_npm :
231213 node_version : << parameters.node_version >>
232-
233214 - setup_npm_user
234- - run : npm ci --loglevel verbose
215+ - run : npm ci
235216 # make docker appear to be broken.
236217 - run : " function docker() { return 1; }"
237218 - run :
238219 name : Install JUnit coverage reporter
239220 command : npm install --no-save jest-junit
240221 - run :
241222 name : Run Windows tests in parallel
242- command : |
243- TEST=$(circleci tests glob "test/windows/**/*.spec.ts" | circleci tests split --split-by=timings | sed 's#\\\\#/#g')
244- npm run test-jest-windows -- $TEST --reporters=default --reporters=jest-junit
223+ command : npm run test-jest-windows --reporters=default --reporters=jest-junit
245224 environment :
246225 JEST_JUNIT_OUTPUT_DIR : ' ./reports/junit'
247226 JEST_JUNIT_ADD_FILE_ATTRIBUTE : ' true' # We need this to make --split-by=timings work
0 commit comments