migrate serve flavors

Signed-off-by: can <can@anyscale.com>
ray-project · Aug 29, 2023 · 33fab66 · 33fab66
1 parent a58de4a
commit 33fab66
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 83 deletions.
diff --git a/.buildkite/pipeline.build.yml b/.buildkite/pipeline.build.yml
@@ -23,22 +23,6 @@
     - ./dashboard/tests/run_ui_tests.sh
     - bazel test --config=ci $(./ci/run/bazel_export_options) python/ray/dashboard/...
 
-- label: ":serverless: Serve Release Tests"
-  conditions:
-    [
-        "RAY_CI_SERVE_AFFECTED",
-        "RAY_CI_PYTHON_AFFECTED",
-    ]
-  instance_size: medium
-  commands:
-    - cleanup() { if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then ./ci/build/upload_build_info.sh; fi }; trap cleanup EXIT
-    - TORCH_VERSION=1.9.0 ./ci/env/install-dependencies.sh
-    - 'git clone https://github.com/wg/wrk.git /tmp/wrk && pushd /tmp/wrk && make -j && sudo cp wrk /usr/local/bin && popd'
-    - ./ci/env/env_info.sh
-    - bazel test --config=ci $(./ci/run/bazel_export_options)
-      --test_tag_filters=team:serve
-      release/...
-
 # the bulk of serve tests are now run on civ2 infra, and defined in 
 # pipeline.build_serve.yml
 - label: ":serverless: Serve HA Tests"
@@ -64,73 +48,6 @@
       --test_tag_filters=-post_wheel_build,-gpu,xcommit
       python/ray/serve/...
 
-- label: ":serverless: Serve Tests (streaming FF off)"
-  parallelism: 3
-  conditions:
-    [
-        "RAY_CI_SERVE_AFFECTED",
-        "RAY_CI_PYTHON_AFFECTED",
-        "RAY_CI_ML_AFFECTED",
-    ]
-  instance_size: large
-  commands:
-    - cleanup() { if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then ./ci/build/upload_build_info.sh; fi }; trap cleanup EXIT
-    - TORCH_VERSION=1.9.0 ./ci/env/install-dependencies.sh
-    - bash ./ci/ci.sh prepare_docker
-    - 'git clone https://github.com/wg/wrk.git /tmp/wrk && pushd /tmp/wrk && make -j && sudo cp wrk /usr/local/bin && popd'
-    - ./ci/env/env_info.sh
-    - >-
-      set -x;
-      python ./ci/ray_ci/bazel_sharding.py
-      --exclude_manual
-      --index "\${BUILDKITE_PARALLEL_JOB}" --count "\${BUILDKITE_PARALLEL_JOB_COUNT}"
-      --tag_filters=-post_wheel_build,-gpu
-      python/ray/serve/...
-      > test_shard.txt
-    - cat test_shard.txt
-    - bazel test --config=ci $(./ci/run/bazel_export_options)
-      --test_tag_filters=-post_wheel_build,-gpu
-      --test_env=DOCKER_HOST=tcp://docker:2376
-      --test_env=DOCKER_TLS_VERIFY=1
-      --test_env=DOCKER_CERT_PATH=/certs/client
-      --test_env=DOCKER_TLS_CERTDIR=/certs
-      --test_env=RAY_SERVE_ENABLE_EXPERIMENTAL_STREAMING=0
-      $(cat test_shard.txt)
-
-- label: ":serverless: Serve Tests (streaming and routing FFs off)"
-  parallelism: 3
-  conditions:
-    [
-        "RAY_CI_SERVE_AFFECTED",
-        "RAY_CI_PYTHON_AFFECTED",
-        "RAY_CI_ML_AFFECTED",
-    ]
-  instance_size: large
-  commands:
-    - cleanup() { if [ "${BUILDKITE_PULL_REQUEST}" = "false" ]; then ./ci/build/upload_build_info.sh; fi }; trap cleanup EXIT
-    - TORCH_VERSION=1.9.0 ./ci/env/install-dependencies.sh
-    - bash ./ci/ci.sh prepare_docker
-    - 'git clone https://github.com/wg/wrk.git /tmp/wrk && pushd /tmp/wrk && make -j && sudo cp wrk /usr/local/bin && popd'
-    - ./ci/env/env_info.sh
-    - >-
-      set -x;
-      python ./ci/ray_ci/bazel_sharding.py
-      --exclude_manual
-      --index "\${BUILDKITE_PARALLEL_JOB}" --count "\${BUILDKITE_PARALLEL_JOB_COUNT}"
-      --tag_filters=-post_wheel_build,-gpu
-      python/ray/serve/...
-      > test_shard.txt
-    - cat test_shard.txt
-    - bazel test --config=ci $(./ci/run/bazel_export_options)
-      --test_tag_filters=-post_wheel_build,-gpu
-      --test_env=DOCKER_HOST=tcp://docker:2376
-      --test_env=DOCKER_TLS_VERIFY=1
-      --test_env=DOCKER_CERT_PATH=/certs/client
-      --test_env=DOCKER_TLS_CERTDIR=/certs
-      --test_env=RAY_SERVE_ENABLE_NEW_ROUTING=0
-      --test_env=RAY_SERVE_ENABLE_EXPERIMENTAL_STREAMING=0
-      $(cat test_shard.txt)
-
 - label: ":python: Minimal install Python {{matrix}}"
   conditions: ["RAY_CI_PYTHON_AFFECTED"]
   instance_size: medium

diff --git a/.buildkite/serve.rayci.yml b/.buildkite/serve.rayci.yml
@@ -7,6 +7,13 @@ steps:
     depends_on: servebuild
     job_env: servebuild
 
+  - label: ":ray-serve: server: release tests"
+    instance_type: medium
+    commands:
+      - bazel run //ci/ray_ci:test -- //release/... serve --parallelism-per-worker 3
+    depends_on: servebuild
+    job_env: servebuild
+
   - label: ":ray-serve: serve: serve tests"
     parallelism: 3
     instance_type: large
@@ -15,3 +22,24 @@ steps:
         --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
     depends_on: servebuild
     job_env: servebuild
+
+  - label: ":ray-serve: serve: serve tests (streaming ff off)"
+    parallelism: 3
+    instance_type: large
+    commands:
+      - bazel run //ci/ray_ci:test -- //python/ray/serve/... serve --except-tags post_wheel_build,gpu,xcommit
+        --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
+        --test_env=RAY_SERVE_ENABLE_EXPERIMENTAL_STREAMING=0
+    depends_on: servebuild
+    job_env: servebuild
+
+  - label: ":ray-serve: serve: serve tests (streaming and routing ff off)"
+    parallelism: 3
+    instance_type: large
+    commands:
+      - bazel run //ci/ray_ci:test -- //python/ray/serve/... serve --except-tags post_wheel_build,gpu,xcommit
+        --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
+        --test_env=RAY_SERVE_ENABLE_NEW_ROUTING=0
+        --test_env=RAY_SERVE_ENABLE_EXPERIMENTAL_STREAMING=0
+    depends_on: servebuild
+    job_env: servebuild
diff --git a/ci/docker/datanbuild.wanda.yaml b/ci/docker/datanbuild.wanda.yaml
@@ -0,0 +1,15 @@
+name: "datanbuild"
+froms: ["cr.ray.io/rayproject/oss-ci-base_ml"]
+dockerfile: ci/docker/data.build.Dockerfile
+srcs:
+  - ci/env/install-dependencies.sh
+  - python/requirements.txt
+  - python/requirements_compiled.txt
+  - python/requirements/test-requirements.txt
+  - python/requirements/ml/dl-cpu-requirements.txt
+  - python/requirements/ml/data-requirements.txt
+  - python/requirements/ml/data-test-requirements.txt
+build_args:
+  - ARROW_VERSION=nightly
+tags:
+  - cr.ray.io/rayproject/datanbuild