Skip to content

Commit

Permalink
Backport PR #43468: CI: split Windows Azure tests in half (#43497)
Browse files Browse the repository at this point in the history
  • Loading branch information
Dr-Irv authored Sep 10, 2021
1 parent 8b55e4f commit 6fec9a5
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ jobs:
PANDAS_DATA_MANAGER: array
PATTERN: ${{ matrix.pattern }}
PYTEST_WORKERS: "auto"
PYTEST_TARGET: pandas
run: |
source activate pandas-dev
ci/run_tests.sh
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/posix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
LC_ALL: ${{ matrix.settings[4] }}
PANDAS_TESTING_MODE: ${{ matrix.settings[5] }}
TEST_ARGS: ${{ matrix.settings[6] }}
PYTEST_TARGET: pandas

steps:
- name: Checkout
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/python-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ env:
PANDAS_CI: 1
PATTERN: "not slow and not network and not clipboard"
COVERAGE: true
PYTEST_TARGET: pandas

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ pr:

variables:
PYTEST_WORKERS: auto
PYTEST_TARGET: pandas

jobs:
# Mac and Linux use the same template
Expand Down
23 changes: 20 additions & 3 deletions ci/azure/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,33 @@ jobs:
vmImage: ${{ parameters.vmImage }}
strategy:
matrix:
py37_np17:
py37_np17_1:
ENV_FILE: ci/deps/azure-windows-37.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network"
PYTEST_WORKERS: 2 # GH-42236
PYTEST_TARGET: "pandas/tests/[a-i]*"

py38_np18:
py37_np17_2:
ENV_FILE: ci/deps/azure-windows-37.yaml
CONDA_PY: "37"
PATTERN: "not slow and not network"
PYTEST_WORKERS: 2 # GH-42236
PYTEST_TARGET: "pandas/tests/[j-z]*"

py38_np18_1:
ENV_FILE: ci/deps/azure-windows-38.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network and not high_memory"
PATTERN: "not slow and not network"
PYTEST_WORKERS: 2 # GH-42236
PYTEST_TARGET: "pandas/tests/[a-i]*"

py38_np18_2:
ENV_FILE: ci/deps/azure-windows-38.yaml
CONDA_PY: "38"
PATTERN: "not slow and not network"
PYTEST_WORKERS: 2 # GH-42236
PYTEST_TARGET: "pandas/tests/[j-z]*"

steps:
- powershell: |
Expand All @@ -42,6 +58,7 @@ jobs:
- bash: |
source activate pandas-dev
wmic.exe cpu get caption, deviceid, name, numberofcores, maxclockspeed
ci/run_tests.sh
displayName: 'Test'
Expand Down
2 changes: 1 addition & 1 deletion ci/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then
XVFB="xvfb-run "
fi

PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE pandas"
PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET"

if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then
# GH#37455 windows py38 build appears to be running out of memory
Expand Down

0 comments on commit 6fec9a5

Please sign in to comment.