move serve release tests to civ2 (ray-project#40414)

Move serve release tests to civ2. Also improve test coverage to run less tests on .buildkite files. Signed-off-by: can <[email protected]>
liudunxu · Oct 18, 2023 · b3c1424 · b3c1424
1 parent 5205a2d
commit b3c1424
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/.buildkite/pipeline.build.yml b/.buildkite/pipeline.build.yml
@@ -17,22 +17,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"

diff --git a/.buildkite/serve.rayci.yml b/.buildkite/serve.rayci.yml
@@ -17,7 +17,6 @@ steps:
     parallelism: 2
     tags: 
       - serve
-      - ml
       - python
     instance_type: large
     soft_fail: true
@@ -28,6 +27,16 @@ steps:
     depends_on: servepydantic2build
     job_env: forge
 
+  - label: ":ray-serve: serve: release tests"
+    tags:
+      - serve
+      - python
+    instance_type: medium
+    commands:
+      - bazel run //ci/ray_ci:test_in_docker -- //release/... serve --parallelism-per-worker 3
+    depends_on: servebuild
+    job_env: forge
+
   - label: ":ray-serve: serve: flaky tests"
     tags: 
       - serve

diff --git a/ci/docker/serve.build.Dockerfile b/ci/docker/serve.build.Dockerfile
@@ -21,4 +21,6 @@ RUN pip install -U --ignore-installed \
   -r python/requirements.txt \
   -r python/requirements/test-requirements.txt
 
+RUN git clone https://github.com/wg/wrk.git /tmp/wrk && pushd /tmp/wrk && make -j && sudo cp wrk /usr/local/bin && popd
+
 RUN if [[ -z $PYDANTIC_VERSION ]] ; then echo Not installing custom Pydantic version ; else pip install -U pydantic==$PYDANTIC_VERSION ; fi
diff --git a/ci/pipeline/determine_tests_to_run.py b/ci/pipeline/determine_tests_to_run.py
@@ -185,12 +185,19 @@ def get_commit_range():
             elif re.match("rllib_contrib/", changed_file):
                 if not changed_file.endswith(".md"):
                     RAY_CI_RLLIB_CONTRIB_AFFECTED = 1
-            elif changed_file.startswith("python/ray/serve"):
+            elif (
+                changed_file.startswith("python/ray/serve")
+                or changed_file == ".buildkite/serve.rayci.yml"
+                or changed_file == "ci/docker/serve.build.Dockerfile"
+            ):
                 RAY_CI_DOC_AFFECTED = 1
                 RAY_CI_SERVE_AFFECTED = 1
                 RAY_CI_LINUX_WHEELS_AFFECTED = 1
                 RAY_CI_MACOS_WHEELS_AFFECTED = 1
                 RAY_CI_JAVA_AFFECTED = 1
+            elif changed_file == ".buildkite/pipeline.build.yml":
+                RAY_CI_PYTHON_AFFECTED = 1
+                RAY_CI_SERVE_AFFECTED = 1
             elif changed_file.startswith("python/ray/dashboard"):
                 RAY_CI_DASHBOARD_AFFECTED = 1
                 # https://github.com/ray-project/ray/pull/15981