From 16f72123945705764e8c5943743aa453cd7b4a4a Mon Sep 17 00:00:00 2001 From: Lonnie Liu <95255098+aslonnie@users.noreply.github.com> Date: Thu, 27 Feb 2025 20:27:18 -0800 Subject: [PATCH] [ci] support a different build-type for wheel compile (#50933) this allows skipping the wheel compiling when running cpp tests Signed-off-by: Lonnie Liu --- .buildkite/core.rayci.yml | 31 +++++++++++++++++++++---------- ci/ray_ci/tests.env.Dockerfile | 15 +++++++++------ 2 files changed, 30 insertions(+), 16 deletions(-) diff --git a/.buildkite/core.rayci.yml b/.buildkite/core.rayci.yml index 8052791fda487..6a6be0aed785d 100644 --- a/.buildkite/core.rayci.yml +++ b/.buildkite/core.rayci.yml @@ -52,12 +52,12 @@ steps: instance_type: large parallelism: 4 commands: - - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... python/ray/autoscaler/v2/... core + - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core --install-mask serve --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3 --except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu --install-mask serve - - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... python/ray/autoscaler/v2/... core + - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --only-tags use_all_core --skip-ray-installation @@ -68,12 +68,12 @@ steps: - dashboard instance_type: large commands: - - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... python/ray/autoscaler/v2/... core + - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core --install-mask serve --workers 4 --worker-id "{{matrix.worker_id}}" --parallelism-per-worker 3 --python-version {{matrix.python}} --except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu - - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... python/ray/autoscaler/v2/... core + - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core --install-mask serve --workers 4 --worker-id "{{matrix.worker_id}}" --parallelism-per-worker 3 --python-version {{matrix.python}} @@ -92,12 +92,12 @@ steps: instance_type: large parallelism: 4 commands: - - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... python/ray/autoscaler/v2/... core + - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core --install-mask serve --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3 --test-env=TEST_EXTERNAL_REDIS=1 --except-tags debug_tests,asan_tests,post_wheel_build,ha_integration,mem_pressure,tmpfs,container,manual,use_all_core,multi_gpu - - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... python/ray/autoscaler/v2/... core + - bazel run //ci/ray_ci:test_in_docker -- //python/ray/tests/... //python/ray/dag/... //python/ray/autoscaler/v2/... core --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --only-tags use_all_core --skip-ray-installation @@ -313,6 +313,17 @@ steps: --except-tags no_tsan --cache-test-results --parallelism-per-worker 2 + - label: ":ray: core: flaky cpp tests" + key: core_flaky_cpp_tests + tags: + - python + - skip-on-premerge + instance_type: large + soft_fail: true + commands: + - bazel run //ci/ray_ci:test_in_docker -- //:all //src/... core + --run-flaky-tests --build-type clang + - label: ":ray: core: flaky tests" key: core_flaky_tests tags: @@ -321,9 +332,9 @@ steps: instance_type: large soft_fail: true commands: - - bazel run //ci/ray_ci:test_in_docker -- //... core + - bazel run //ci/ray_ci:test_in_docker -- //python/ray/... //doc/... core --install-mask serve - --run-flaky-tests --build-type clang + --run-flaky-tests --except-tags multi_gpu - label: ":ray: core: flaky gpu tests" @@ -335,9 +346,9 @@ steps: instance_type: gpu-large soft_fail: true commands: - - bazel run //ci/ray_ci:test_in_docker -- //... core + - bazel run //ci/ray_ci:test_in_docker -- //python/ray/... //doc/... core --install-mask serve - --run-flaky-tests --build-type clang + --run-flaky-tests --gpus 4 --build-name coregpubuild --only-tags multi_gpu diff --git a/ci/ray_ci/tests.env.Dockerfile b/ci/ray_ci/tests.env.Dockerfile index b5330e7a5741d..38f2eb097a465 100644 --- a/ci/ray_ci/tests.env.Dockerfile +++ b/ci/ray_ci/tests.env.Dockerfile @@ -24,8 +24,14 @@ if [[ "$BUILDKITE_CACHE_READONLY" == "true" ]]; then echo "build --remote_upload_local_results=false" >> ~/.bazelrc fi -if [[ "$BUILD_TYPE" == "skip" ]]; then - echo "Skipping build" +if [[ "$BUILD_TYPE" == "skip" || "${BUILD_TYPE}" == "ubsan" ]]; then + echo "Skipping building ray package" + exit 0 +fi + +if [[ "$BUILD_TYPE" == "clang" || "$BUILD_TYPE" == "asan-clang" || "$BUILD_TYPE" == "tsan-clang" ]]; then + echo "--- Install LLVM dependencies (and skip building ray package)" + bash ci/env/install-llvm-binaries.sh exit 0 fi @@ -52,11 +58,8 @@ elif [[ "$BUILD_TYPE" == "asan" ]]; then pip install -v -e python/ bazel build $(./ci/run/bazel_export_options) --no//:jemalloc_flag //:ray_pkg elif [[ "$BUILD_TYPE" == "java" ]]; then - ./java/build-jar-multiplatform.sh linux + bash java/build-jar-multiplatform.sh linux RAY_INSTALL_JAVA=1 pip install -v -e python/ -elif [[ "$BUILD_TYPE" == "clang" || "$BUILD_TYPE" == "asan-clang" || "$BUILD_TYPE" == "tsan-clang" ]]; then - ./ci/env/install-llvm-binaries.sh - pip install -v -e python/ else pip install -v -e python/ fi