Skip to content

Commit dd489ed

Browse files
elliot-barnaslonnie
authored and
SheldonTsen
committed
[ci] updating data ci tests to py310 (ray-project#58378)
upgrading data ci tests to py3.10 postmerge build: https://buildkite.com/ray-project/postmerge/builds/14192 --------- Signed-off-by: elliot-barn <[email protected]> Co-authored-by: Lonnie Liu <[email protected]>
1 parent 94ce173 commit dd489ed

File tree

8 files changed

+66
-37
lines changed

8 files changed

+66
-37
lines changed

‎.buildkite/base.rayci.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ steps:
5050
label: "wanda: oss-ci-base_ml-py{{matrix}}"
5151
wanda: ci/docker/base.ml.wanda.yaml
5252
matrix:
53+
- "3.10"
5354
- "3.11"
5455
- "3.12"
5556
env:

‎.buildkite/data.rayci.yml‎

Lines changed: 52 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,56 @@
11
group: data tests
22
depends_on:
33
- forge
4-
- oss-ci-base_ml
4+
- oss-ci-base_ml-multipy
55
- ray-core-build
66
- ray-dashboard-build
77
steps:
88
# builds
9-
- name: data9build
9+
- name: data9build-multipy
10+
label: "wanda: data9build-py{{matrix}}"
1011
wanda: ci/docker/data9.build.wanda.yaml
12+
matrix:
13+
- "3.10"
14+
env:
15+
PYTHON: "{{matrix}}"
1116
tags: cibase
1217

13-
- name: datalbuild
18+
- name: datalbuild-multipy
19+
label: "wanda: datalbuild-py{{matrix}}"
1420
wanda: ci/docker/datal.build.wanda.yaml
15-
tags: cibase
21+
matrix:
22+
- "3.10"
23+
env:
24+
PYTHON: "{{matrix}}"
1625

1726
- name: databuild-multipy
1827
label: "wanda: databuild-py{{matrix}}"
1928
wanda: ci/docker/data.build.wanda.yaml
20-
matrix: ["3.12"]
29+
matrix: ["3.10", "3.12"]
2130
env:
2231
PYTHON: "{{matrix}}"
23-
depends_on: oss-ci-base_ml-multipy
2432
tags: cibase
2533

2634
- name: datanbuild
2735
wanda: ci/docker/datan.build.wanda.yaml
2836
tags: cibase
2937

30-
- name: datamongobuild
38+
- name: datamongobuild-multipy
39+
label: "wanda: datamongobuild-py{{matrix}}"
3140
wanda: ci/docker/datamongo.build.wanda.yaml
41+
matrix:
42+
- "3.10"
43+
env:
44+
PYTHON: "{{matrix}}"
3245
tags: cibase
3346

34-
- name: datatfxbslbuild
47+
- name: datatfxbslbuild-multipy
48+
label: "wanda: datatfxbslbuild-py{{matrix}}"
3549
wanda: ci/docker/datatfxbsl.build.wanda.yaml
50+
matrix:
51+
- "3.10"
52+
env:
53+
PYTHON: "{{matrix}}"
3654
tags: cibase
3755

3856
# tests
@@ -73,9 +91,10 @@ steps:
7391
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/data/... //python/ray/air/... data
7492
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}"
7593
--worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
76-
--build-name datalbuild
94+
--build-name databuild-py3.10
95+
--python-version 3.10
7796
--except-tags data_integration,doctest,data_non_parallel,dask,needs_credentials
78-
depends_on: datalbuild
97+
depends_on: datalbuild-multipy
7998

8099
- label: ":database: data: arrow v21 tests (data_non_parallel)"
81100
tags:
@@ -88,9 +107,10 @@ steps:
88107
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/data/... //python/ray/air/... data
89108
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}"
90109
--worker-id "$${BUILDKITE_PARALLEL_JOB}"
91-
--build-name datalbuild
110+
--build-name databuild-py3.10
111+
--python-version 3.10
92112
--only-tags data_non_parallel
93-
depends_on: datalbuild
113+
depends_on: datalbuild-multipy
94114

95115
- label: ":database: data: arrow v21 {{matrix.python}} tests ({{matrix.worker_id}})"
96116
key: datal_python_tests
@@ -171,9 +191,10 @@ steps:
171191
instance_type: medium
172192
commands:
173193
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/data/... data
174-
--build-name datatfxbslbuild
194+
--build-name datatfxbslbuild-py3.10
195+
--python-version 3.10
175196
--only-tags tfxbsl
176-
depends_on: datatfxbslbuild
197+
depends_on: datatfxbslbuild-multipy
177198

178199
- label: ":database: data: doc tests"
179200
tags:
@@ -183,17 +204,19 @@ steps:
183204
commands:
184205
# doc tests
185206
- bazel run //ci/ray_ci:test_in_docker -- python/ray/... //doc/... data
186-
--build-name datalbuild
207+
--build-name databuild-py3.10
208+
--python-version 3.10
187209
--except-tags gpu
188210
--only-tags doctest
189211
--parallelism-per-worker 2
190212
# doc examples
191213
- bazel run //ci/ray_ci:test_in_docker -- //doc/... data
192-
--build-name datalbuild
214+
--build-name databuild-py3.10
215+
--python-version 3.10
193216
--except-tags gpu,post_wheel_build,doctest,dask
194217
--parallelism-per-worker 2
195218
--skip-ray-installation
196-
depends_on: datalbuild
219+
depends_on: datalbuild-multipy
197220

198221
- label: ":database: data: dask doc tests"
199222
tags:
@@ -237,11 +260,12 @@ steps:
237260
instance_type: medium
238261
commands:
239262
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/data/... data
240-
--build-name datamongobuild
263+
--build-name datamongobuild-py3.10
264+
--python-version 3.10
241265
--build-type java
242266
--only-tags data_integration
243267
--except-tags doctest
244-
depends_on: datamongobuild
268+
depends_on: datamongobuild-multipy
245269

246270
- label: ":database: data: dashboard tests"
247271
tags:
@@ -251,9 +275,10 @@ steps:
251275
instance_type: small
252276
commands:
253277
- bazel run //ci/ray_ci:test_in_docker -- python/ray/dashboard/... data
254-
--build-name datalbuild
278+
--build-name databuild-py3.10
279+
--python-version 3.10
255280
--parallelism-per-worker 3
256-
depends_on: datalbuild
281+
depends_on: datalbuild-multipy
257282

258283
- label: ":database: data: flaky tests"
259284
key: data_flaky_tests
@@ -267,9 +292,10 @@ steps:
267292
commands:
268293
- bazel run //ci/ray_ci:test_in_docker -- //... data --run-flaky-tests
269294
--parallelism-per-worker 3
270-
--build-name datalbuild
295+
--build-name databuild-py3.10
296+
--python-version 3.10
271297
--except-tags gpu_only,gpu
272-
depends_on: datalbuild
298+
depends_on: datalbuild-multipy
273299

274300
- label: ":database: data: flaky gpu tests"
275301
key: data_flaky_gpu_tests
@@ -296,7 +322,8 @@ steps:
296322
commands:
297323
- $(python ci/env/setup_credentials.py)
298324
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/data/... data
299-
--build-name datalbuild
325+
--build-name databuild-py3.10
326+
--python-version 3.10
300327
--only-tags needs_credentials
301328
--test-env=SNOWFLAKE_USER --test-env=SNOWFLAKE_ACCOUNT --test-env=SNOWFLAKE_DATABASE --test-env=SNOWFLAKE_SCHEMA --test-env=SNOWFLAKE_WAREHOUSE --test-env=SNOWFLAKE_PRIVATE_KEY
302-
depends_on: datalbuild
329+
depends_on: datalbuild-multipy

‎ci/docker/data-tfxbsl.build.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.3-labs
22

3-
ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_ml
3+
ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_ml-py3.10
44
FROM $DOCKER_IMAGE_BASE_BUILD
55

66
ARG ARROW_VERSION=14.*

‎ci/docker/data.build.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1.3-labs
22

3-
ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_ml
3+
ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_ml-py3.10
44
FROM $DOCKER_IMAGE_BASE_BUILD
55

66
ARG ARROW_VERSION=20.*

‎ci/docker/data9.build.wanda.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: "data9build"
2-
froms: ["cr.ray.io/rayproject/oss-ci-base_ml"]
2+
froms: ["cr.ray.io/rayproject/oss-ci-base_ml-py$PYTHON"]
33
dockerfile: ci/docker/data.build.Dockerfile
44
srcs:
55
- ci/env/install-dependencies.sh

‎ci/docker/datal.build.wanda.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: "datalbuild"
2-
froms: ["cr.ray.io/rayproject/oss-ci-base_ml"]
1+
name: "databuild-py$PYTHON"
2+
froms: ["cr.ray.io/rayproject/oss-ci-base_ml-py$PYTHON"]
33
dockerfile: ci/docker/data.build.Dockerfile
44
srcs:
55
- ci/env/install-dependencies.sh
@@ -12,4 +12,4 @@ srcs:
1212
build_args:
1313
- ARROW_VERSION=21.*
1414
tags:
15-
- cr.ray.io/rayproject/datalbuild
15+
- cr.ray.io/rayproject/databuild-py$PYTHON

‎ci/docker/datamongo.build.wanda.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: "datamongobuild"
2-
froms: ["cr.ray.io/rayproject/oss-ci-base_ml"]
1+
name: "datamongobuild-py$PYTHON"
2+
froms: ["cr.ray.io/rayproject/oss-ci-base_ml-py$PYTHON"]
33
dockerfile: ci/docker/data.build.Dockerfile
44
srcs:
55
- ci/env/install-dependencies.sh
@@ -13,5 +13,6 @@ build_args:
1313
- ARROW_VERSION=9.*
1414
- ARROW_MONGO_VERSION=0.5.*
1515
- RAY_CI_JAVA_BUILD=1
16+
- DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_ml-py$PYTHON
1617
tags:
17-
- cr.ray.io/rayproject/datamongobuild
18+
- cr.ray.io/rayproject/datamongobuild-py$PYTHON

‎ci/docker/datatfxbsl.build.wanda.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: "datatfxbslbuild"
2-
froms: ["cr.ray.io/rayproject/oss-ci-base_ml"]
1+
name: "datatfxbslbuild-py$PYTHON"
2+
froms: ["cr.ray.io/rayproject/oss-ci-base_ml-py$PYTHON"]
33
dockerfile: ci/docker/data-tfxbsl.build.Dockerfile
44
srcs:
55
- ci/env/install-dependencies.sh
@@ -11,4 +11,4 @@ srcs:
1111
build_args:
1212
- ARROW_VERSION=14.*
1313
tags:
14-
- cr.ray.io/rayproject/datatfxbslbuild
14+
- cr.ray.io/rayproject/datatfxbslbuild-py$PYTHON

0 commit comments

Comments
 (0)