Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .buildkite/base.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ steps:
label: "wanda: oss-ci-base_gpu-py{{matrix}}"
wanda: ci/docker/base.gpu.wanda.yaml
matrix:
- "3.10"
- "3.11"
- "3.12"
env:
Expand Down Expand Up @@ -93,6 +94,9 @@ steps:
tags: cibase

- name: docgpubuild
label: "wanda: docgpubuild-py3.10"
wanda: ci/docker/docgpu.build.wanda.yaml
depends_on: oss-ci-base_gpu
depends_on: oss-ci-base_gpu-multipy
env:
PYTHON: "3.10"
tags: cibase
9 changes: 6 additions & 3 deletions .buildkite/data.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,15 +217,17 @@ steps:
commands:
# doc tests
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/data/... //doc/... data
--build-name docgpubuild
--build-name docgpubuild-py3.10
--only-tags doctest
--except-tags cpu
--python-version 3.10
# doc examples
- bazel run //ci/ray_ci:test_in_docker -- //doc/... data
--build-name docgpubuild
--build-name docgpubuild-py3.10
--except-tags doctest
--only-tags gpu
--skip-ray-installation
--python-version 3.10
depends_on: docgpubuild

- label: ":database: data: integration tests"
Expand Down Expand Up @@ -279,8 +281,9 @@ steps:
soft_fail: true
commands:
- bazel run //ci/ray_ci:test_in_docker -- //... data --run-flaky-tests
--build-name docgpubuild
--build-name docgpubuild-py3.10
--only-tags gpu,gpu_only
--python-version 3.10
depends_on: docgpubuild
- label: ":data: postmerge authenticated tests"
key: data_postmerge_authenticated_tests
Expand Down
7 changes: 5 additions & 2 deletions .buildkite/ml.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@ depends_on:
steps:
# builds
- name: minbuild-ml
label: "wanda: minbuild-ml-py39"
label: "wanda: minbuild-ml-py{{matrix}}"
wanda: ci/docker/min.build.wanda.yaml
depends_on: oss-ci-base_build
matrix:
- "3.9"
- "3.10"
env:
PYTHON_VERSION: "3.9"
PYTHON_VERSION: "{{matrix}}"
EXTRA_DEPENDENCY: ml
tags: cibase

Expand Down
10 changes: 5 additions & 5 deletions .buildkite/serve.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ steps:
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
--build-name servepydantic1build --test-env=EXPECTED_PYTHON_VERSION=3.9 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
--build-name servepydantic1build --test-env=EXPECTED_PYTHON_VERSION=3.10 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bug: Python Version Mismatch in CI Pipeline

The "pydantic < 2.0 tests" job now expects EXPECTED_PYTHON_VERSION=3.10. However, the servepydantic1build step it depends on still produces a Python 3.9 build, leading to a version mismatch and test failures.

Fix in Cursor Fix in Web

depends_on: servepydantic1build

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

- label: ":ray-serve: serve: python {{matrix.python}} tests ({{matrix.worker_id}})"
if: build.pull_request.labels includes "continuous-build" || pipeline.id == "0189e759-8c96-4302-b6b5-b4274406bf89" || pipeline.id == "018f4f1e-1b73-4906-9802-92422e3badaa"
Expand Down Expand Up @@ -214,8 +214,8 @@ steps:
instance_type: gpu
commands:
- bazel run //ci/ray_ci:test_in_docker -- //doc/... serve
--build-name docgpubuild
--only-tags gpu
--build-name docgpubuild-py3.10
--only-tags gpu --python-version 3.10
depends_on: docgpubuild

- label: ":ray-serve: serve: flaky tests"
Expand Down
3 changes: 1 addition & 2 deletions ci/docker/docgpu.build.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# syntax=docker/dockerfile:1.3-labs

ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_gpu
ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_gpu-py3.10
FROM $DOCKER_IMAGE_BASE_BUILD

SHELL ["/bin/bash", "-ice"]

COPY . .
Expand Down
8 changes: 5 additions & 3 deletions ci/docker/docgpu.build.wanda.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "docgpubuild"
froms: ["cr.ray.io/rayproject/oss-ci-base_gpu"]
name: "docgpubuild-py$PYTHON"
froms: ["cr.ray.io/rayproject/oss-ci-base_gpu-py$PYTHON"]
dockerfile: ci/docker/docgpu.build.Dockerfile
srcs:
- ci/env/install-dependencies.sh
Expand All @@ -17,5 +17,7 @@ srcs:
- python/requirements/ml/data-test-requirements.txt
- python/requirements/ml/rllib-requirements.txt
- python/requirements/ml/rllib-test-requirements.txt
build_args:
- DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_gpu-py$PYTHON
tags:
- cr.ray.io/rayproject/docgpubuild
- cr.ray.io/rayproject/docgpubuild-py$PYTHON