Skip to content

Commit 4c82e82

Browse files
authored
Revert "[ci] enabling python 3.10 for subset of ci tests" (#58160)
Reverts #58036
1 parent 507cbb2 commit 4c82e82

File tree

5 files changed

+18
-25
lines changed

5 files changed

+18
-25
lines changed

.buildkite/base.rayci.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ steps:
88
wanda: ci/docker/base.test.wanda.yaml
99
matrix:
1010
- "3.9"
11-
- "3.10"
1211
- "3.11"
1312
- "3.12"
1413
env:
@@ -24,7 +23,6 @@ steps:
2423
wanda: ci/docker/base.build.wanda.yaml
2524
matrix:
2625
- "3.9"
27-
- "3.10"
2826
- "3.11"
2927
- "3.12"
3028
env:
@@ -85,7 +83,6 @@ steps:
8583
- ray-dashboard-build
8684
matrix:
8785
- "3.9"
88-
- "3.10"
8986
- "3.12"
9087
env:
9188
PYTHON: "{{matrix}}"

.buildkite/build.rayci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ steps:
168168
instance_type: medium
169169
soft_fail: true
170170
commands:
171-
- export WHEEL_URL="https://files.pythonhosted.org/packages/7e/7c/3544cca730265bb6f7a4900b7b7018c08ce5ec89bf7b6102901fe0bcd67b/ray-2.44.1-cp310-cp310-manylinux2014_x86_64.whl"
172-
- export CPP_WHEEL_URL="https://files.pythonhosted.org/packages/50/ae/c094818fd526bfb0a361a76bda5708a73cbc888b51edfc7d6aab9de837cd/ray_cpp-2.44.1-cp310-cp310-manylinux2014_x86_64.whl"
171+
- export WHEEL_URL="https://files.pythonhosted.org/packages/7e/7c/3544cca730265bb6f7a4900b7b7018c08ce5ec89bf7b6102901fe0bcd67b/ray-2.44.1-cp39-cp39-manylinux2014_x86_64.whl"
172+
- export CPP_WHEEL_URL="https://files.pythonhosted.org/packages/50/ae/c094818fd526bfb0a361a76bda5708a73cbc888b51edfc7d6aab9de837cd/ray_cpp-2.44.1-cp39-cp39-manylinux2014_x86_64.whl"
173173
- bash build-docker.sh --progress-plain
174174
- docker run -ti --rm rayproject/ray:dev python -c "import ray; print(ray.__version__)"
175175
depends_on:

.buildkite/lint.rayci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ steps:
6464
commands:
6565
- make -C doc/ linkcheck_all
6666
depends_on: docbuild
67-
job_env: docbuild-py3.10
67+
job_env: docbuild-py3.9
6868
tags:
6969
- oss
7070
- skip-on-premerge

.buildkite/ml.rayci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,11 @@ depends_on:
66
steps:
77
# builds
88
- name: minbuild-ml
9-
label: "wanda: minbuild-ml-py{{matrix}}"
9+
label: "wanda: minbuild-ml-py39"
1010
wanda: ci/docker/min.build.wanda.yaml
1111
depends_on: oss-ci-base_build
12-
matrix:
13-
- "3.9"
14-
- "3.10"
1512
env:
16-
PYTHON_VERSION: "{{matrix}}"
13+
PYTHON_VERSION: "3.9"
1714
EXTRA_DEPENDENCY: ml
1815
tags: cibase
1916

.buildkite/serve.rayci.yml

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ steps:
1313
- name: servebuild-multipy
1414
label: "wanda: servebuild-py{{matrix}}"
1515
wanda: ci/docker/serve.build.wanda.yaml
16-
matrix: ["3.10","3.12"]
16+
matrix: ["3.12"]
1717
env:
1818
PYTHON: "{{matrix}}"
1919
depends_on: oss-ci-base_build-multipy
@@ -26,16 +26,15 @@ steps:
2626
- name: servetracingbuild
2727
wanda: ci/docker/servetracing.build.wanda.yaml
2828

29-
- name: minbuild-multipy
30-
label: "wanda: minbuild-{{matrix.app}}-py{{matrix.python}}"
29+
- name: minbuild-serve
30+
label: "wanda: minbuild-{{matrix}}-py39"
3131
wanda: ci/docker/min.build.wanda.yaml
3232
matrix:
33-
setup:
34-
app: [serve, default]
35-
python: ["3.9", "3.10"]
33+
- serve
34+
- default
3635
env:
37-
PYTHON_VERSION: "{{matrix.python}}"
38-
EXTRA_DEPENDENCY: "{{matrix.app}}"
36+
PYTHON_VERSION: "3.9"
37+
EXTRA_DEPENDENCY: "{{matrix}}"
3938
tags: cibase
4039

4140
# tests
@@ -64,7 +63,7 @@ steps:
6463
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
6564
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
6665
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
67-
--build-name servepydantic1build --test-env=EXPECTED_PYTHON_VERSION=3.10 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
66+
--build-name servepydantic1build --test-env=EXPECTED_PYTHON_VERSION=3.9 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
6867
depends_on: servepydantic1build
6968

7069
- label: ":ray-serve: serve: same event loop tests"
@@ -79,8 +78,8 @@ steps:
7978
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
8079
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
8180
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
82-
--build-name servebuild-py3.10 --test-env=EXPECTED_PYTHON_VERSION=3.10 --test-env=RAY_SERVE_RUN_USER_CODE_IN_SEPARATE_THREAD=0
83-
depends_on: "servebuild-multipy"
81+
--build-name servebuild --test-env=EXPECTED_PYTHON_VERSION=3.9 --test-env=RAY_SERVE_RUN_USER_CODE_IN_SEPARATE_THREAD=0
82+
depends_on: "servebuild"
8483

8584
- label: ":ray-serve: serve: python {{matrix.python}} tests ({{matrix.worker_id}})"
8685
if: build.pull_request.labels includes "continuous-build" || pipeline.id == "0189e759-8c96-4302-b6b5-b4274406bf89" || pipeline.id == "018f4f1e-1b73-4906-9802-92422e3badaa"
@@ -149,10 +148,10 @@ steps:
149148
commands:
150149
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/dashboard/... serve
151150
--parallelism-per-worker 2
152-
--build-name minbuild-default-py3.10
151+
--build-name minbuild-default-py3.9
153152
--test-env=RAY_DEFAULT=1
154153
--only-tags minimal
155-
depends_on: minbuild-multipy
154+
depends_on: minbuild-serve
156155

157156
- label: ":ray-serve: serve: serve minimal"
158157
tags:
@@ -165,7 +164,7 @@ steps:
165164
--build-name minbuild-serve-py3.9
166165
--test-env=RAY_DEFAULT=1
167166
--only-tags minimal
168-
depends_on: minbuild-multipy
167+
depends_on: minbuild-serve
169168

170169
- label: ":ray-serve: serve: dashboard tests"
171170
tags:

0 commit comments

Comments
 (0)