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
3 changes: 0 additions & 3 deletions .buildkite/base.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ steps:
wanda: ci/docker/base.test.wanda.yaml
matrix:
- "3.9"
- "3.10"
- "3.11"
- "3.12"
env:
Expand All @@ -24,7 +23,6 @@ steps:
wanda: ci/docker/base.build.wanda.yaml
matrix:
- "3.9"
- "3.10"
- "3.11"
- "3.12"
env:
Expand Down Expand Up @@ -85,7 +83,6 @@ steps:
- ray-dashboard-build
matrix:
- "3.9"
- "3.10"
- "3.12"
env:
PYTHON: "{{matrix}}"
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/build.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ steps:
instance_type: medium
soft_fail: true
commands:
- export WHEEL_URL="https://files.pythonhosted.org/packages/7e/7c/3544cca730265bb6f7a4900b7b7018c08ce5ec89bf7b6102901fe0bcd67b/ray-2.44.1-cp310-cp310-manylinux2014_x86_64.whl"
- export CPP_WHEEL_URL="https://files.pythonhosted.org/packages/50/ae/c094818fd526bfb0a361a76bda5708a73cbc888b51edfc7d6aab9de837cd/ray_cpp-2.44.1-cp310-cp310-manylinux2014_x86_64.whl"
- export WHEEL_URL="https://files.pythonhosted.org/packages/7e/7c/3544cca730265bb6f7a4900b7b7018c08ce5ec89bf7b6102901fe0bcd67b/ray-2.44.1-cp39-cp39-manylinux2014_x86_64.whl"
- export CPP_WHEEL_URL="https://files.pythonhosted.org/packages/50/ae/c094818fd526bfb0a361a76bda5708a73cbc888b51edfc7d6aab9de837cd/ray_cpp-2.44.1-cp39-cp39-manylinux2014_x86_64.whl"
- bash build-docker.sh --progress-plain
- docker run -ti --rm rayproject/ray:dev python -c "import ray; print(ray.__version__)"
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/lint.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ steps:
commands:
- make -C doc/ linkcheck_all
depends_on: docbuild
job_env: docbuild-py3.10
job_env: docbuild-py3.9
tags:
- oss
- skip-on-premerge
Expand Down
7 changes: 2 additions & 5 deletions .buildkite/ml.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,11 @@ depends_on:
steps:
# builds
- name: minbuild-ml
label: "wanda: minbuild-ml-py{{matrix}}"
label: "wanda: minbuild-ml-py39"
wanda: ci/docker/min.build.wanda.yaml
depends_on: oss-ci-base_build
matrix:
- "3.9"
- "3.10"
env:
PYTHON_VERSION: "{{matrix}}"
PYTHON_VERSION: "3.9"
EXTRA_DEPENDENCY: ml
tags: cibase

Expand Down
27 changes: 13 additions & 14 deletions .buildkite/serve.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ steps:
- name: servebuild-multipy
label: "wanda: servebuild-py{{matrix}}"
wanda: ci/docker/serve.build.wanda.yaml
matrix: ["3.10","3.12"]
matrix: ["3.12"]
env:
PYTHON: "{{matrix}}"
depends_on: oss-ci-base_build-multipy
Expand All @@ -26,16 +26,15 @@ steps:
- name: servetracingbuild
wanda: ci/docker/servetracing.build.wanda.yaml

- name: minbuild-multipy
label: "wanda: minbuild-{{matrix.app}}-py{{matrix.python}}"
- name: minbuild-serve
label: "wanda: minbuild-{{matrix}}-py39"
wanda: ci/docker/min.build.wanda.yaml
matrix:
setup:
app: [serve, default]
python: ["3.9", "3.10"]
- serve
- default
env:
PYTHON_VERSION: "{{matrix.python}}"
EXTRA_DEPENDENCY: "{{matrix.app}}"
PYTHON_VERSION: "3.9"
EXTRA_DEPENDENCY: "{{matrix}}"
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 Build Names

The label template "wanda: minbuild-{{matrix}}-py39" will generate build names like minbuild-default-py39 and minbuild-serve-py39 (without a dot between 3 and 9), but the build-name references in the commands at lines 151 and 164 use minbuild-default-py3.9 and minbuild-serve-py3.9 (with a dot). This naming mismatch will cause test steps to fail when they cannot find the referenced build artifacts. The label template should use py{{matrix}}.9 instead of py39 to generate the correct build names, or the build-name references should be changed to match the new template format (without the dot).

Fix in Cursor Fix in Web

tags: cibase

# tests
Expand Down Expand Up @@ -64,7 +63,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.10 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
--build-name servepydantic1build --test-env=EXPECTED_PYTHON_VERSION=3.9 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
depends_on: servepydantic1build

- label: ":ray-serve: serve: same event loop tests"
Expand All @@ -79,8 +78,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-py3.10 --test-env=EXPECTED_PYTHON_VERSION=3.10 --test-env=RAY_SERVE_RUN_USER_CODE_IN_SEPARATE_THREAD=0
depends_on: "servebuild-multipy"
--build-name servebuild --test-env=EXPECTED_PYTHON_VERSION=3.9 --test-env=RAY_SERVE_RUN_USER_CODE_IN_SEPARATE_THREAD=0
depends_on: "servebuild"

- 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 @@ -149,10 +148,10 @@ steps:
commands:
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/dashboard/... serve
--parallelism-per-worker 2
--build-name minbuild-default-py3.10
--build-name minbuild-default-py3.9
--test-env=RAY_DEFAULT=1
--only-tags minimal
depends_on: minbuild-multipy
depends_on: minbuild-serve

- label: ":ray-serve: serve: serve minimal"
tags:
Expand All @@ -165,7 +164,7 @@ steps:
--build-name minbuild-serve-py3.9
--test-env=RAY_DEFAULT=1
--only-tags minimal
depends_on: minbuild-multipy
depends_on: minbuild-serve

- label: ":ray-serve: serve: dashboard tests"
tags:
Expand Down