From 6af6c119730e09cde17ace2a55e31cd3374e61ed Mon Sep 17 00:00:00 2001 From: elliot-barn Date: Wed, 15 Apr 2026 17:58:17 +0000 Subject: [PATCH 1/2] updating test rules for dependency updates Signed-off-by: elliot-barn --- .buildkite/test.rules.test.txt | 9 +++++++++ .buildkite/test.rules.txt | 16 ++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/.buildkite/test.rules.test.txt b/.buildkite/test.rules.test.txt index a6c61be774cc..9a4895a94f64 100644 --- a/.buildkite/test.rules.test.txt +++ b/.buildkite/test.rules.test.txt @@ -35,6 +35,15 @@ python/setup.py: ml tune train serve workflow data python dashboard linux_wheels python/requirements/test-requirements.txt: ml tune train serve workflow data python dashboard linux_wheels macos_wheels java python_dependencies min_build python/_raylet.pyx: ml tune train data python dashboard linux_wheels macos_wheels java +# === Raydepsets lock files === +# macos_depset lock is consumed by the mac smoke test, so it must emit macos_wheels. +python/deplocks/ci/macos_depset_py3.10.lock: macos_wheels +# Other deplock updates should NOT trigger the mac smoke test (no macos_wheels). +python/deplocks/base_deps/ray_base_deps_py3.10.lock: ml tune train data python dashboard linux_wheels java +python/deplocks/ci/data-base-ci_depset_py3.10.lock: ml tune train data python dashboard linux_wheels java +# LLM deplocks still hit the earlier llm rule block. +python/deplocks/llm/ray_py311_cpu.lock: llm + # === Buildkite Configs === .buildkite/ml.rayci.yml: ml train train_gpu tune diff --git a/.buildkite/test.rules.txt b/.buildkite/test.rules.txt index c0cf800710f8..08f9c7c701be 100644 --- a/.buildkite/test.rules.txt +++ b/.buildkite/test.rules.txt @@ -85,6 +85,22 @@ python/ray/dashboard/ @ dashboard linux_wheels python ; +# The macOS smoke test installs this specific lock file +# (ci/ray_ci/macos/macos_ci.sh), so changes here must still trigger +# macos_wheels. Must precede the general python/deplocks/ rule below. +python/deplocks/ci/macos_depset_py* +@ macos_wheels +; + +# Raydepsets-generated lock files. These do NOT affect the macOS smoke +# test (which only consumes macos_depset_py*, handled above), so we +# deliberately omit macos_wheels here to avoid running mac tests on +# unrelated lock updates. +python/deplocks/ +@ ml tune train data +@ python dashboard linux_wheels java +; + python/setup.py python/requirements.txt python/requirements_compiled.txt From dca289bce3af764deb4806d7cbc1156f2f60b16e Mon Sep 17 00:00:00 2001 From: elliot-barn Date: Wed, 15 Apr 2026 19:38:34 +0000 Subject: [PATCH 2/2] adding python_dependencies to deplock/* rule and updating tests Signed-off-by: elliot-barn --- .buildkite/test.rules.test.txt | 4 ++-- .buildkite/test.rules.txt | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.buildkite/test.rules.test.txt b/.buildkite/test.rules.test.txt index 9a4895a94f64..e52adfd18ad8 100644 --- a/.buildkite/test.rules.test.txt +++ b/.buildkite/test.rules.test.txt @@ -39,8 +39,8 @@ python/_raylet.pyx: ml tune train data python dashboard linux_wheels macos_wheel # macos_depset lock is consumed by the mac smoke test, so it must emit macos_wheels. python/deplocks/ci/macos_depset_py3.10.lock: macos_wheels # Other deplock updates should NOT trigger the mac smoke test (no macos_wheels). -python/deplocks/base_deps/ray_base_deps_py3.10.lock: ml tune train data python dashboard linux_wheels java -python/deplocks/ci/data-base-ci_depset_py3.10.lock: ml tune train data python dashboard linux_wheels java +python/deplocks/base_deps/ray_base_deps_py3.10.lock: ml tune train serve workflow data python dashboard linux_wheels java python_dependencies min_build +python/deplocks/ci/data-base-ci_depset_py3.10.lock: ml tune train serve workflow data python dashboard linux_wheels java python_dependencies min_build # LLM deplocks still hit the earlier llm rule block. python/deplocks/llm/ray_py311_cpu.lock: llm diff --git a/.buildkite/test.rules.txt b/.buildkite/test.rules.txt index 08f9c7c701be..302bdd69b81f 100644 --- a/.buildkite/test.rules.txt +++ b/.buildkite/test.rules.txt @@ -95,10 +95,12 @@ python/deplocks/ci/macos_depset_py* # Raydepsets-generated lock files. These do NOT affect the macOS smoke # test (which only consumes macos_depset_py*, handled above), so we # deliberately omit macos_wheels here to avoid running mac tests on -# unrelated lock updates. +# unrelated lock updates. Otherwise mirrors the python/setup.py rule's +# tag set so general dependency changes still fan out across CI. python/deplocks/ -@ ml tune train data +@ ml tune train serve workflow data min_build @ python dashboard linux_wheels java +@ python_dependencies ; python/setup.py