[serve] migrate serve ha integration test to civ2 (ray-project#41713)

and rename `xcommit` tag to `ha_integration` Signed-off-by: Lonnie Liu <lonnie@anyscale.com>
ShuN6211 · Dec 8, 2023 · ea35655 · ea35655
1 parent e06a476
commit ea35655
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 29 deletions.
diff --git a/.buildkite/_forge.rayci.yml b/.buildkite/_forge.rayci.yml
@@ -36,6 +36,7 @@ steps:
       - python
       - docker
       - tune
+      - serve
     wanda: ci/docker/ray.cpu.base.wanda.yaml
     matrix:
       - "3.8"

diff --git a/.buildkite/pipeline.build.yml b/.buildkite/pipeline.build.yml
@@ -1,28 +1,3 @@
-# the bulk of serve tests are now run on civ2 infra, and defined in
-# serve.rayci.yaml
-- label: "serve civ1 tests"
-  conditions:
-    [
-        "RAY_CI_SERVE_AFFECTED",
-        "RAY_CI_PYTHON_AFFECTED",
-        "RAY_CI_ML_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
-    - 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
-    - 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_tag_filters=-post_wheel_build,-gpu,xcommit
-      python/ray/serve/tests/...
-
 - label: ":kubernetes: operator"
   conditions: ["RAY_CI_LINUX_WHEELS_AFFECTED"]
   instance_size: medium

diff --git a/.buildkite/serve.rayci.yml b/.buildkite/serve.rayci.yml
@@ -22,7 +22,7 @@ steps:
     instance_type: large
     commands:
       - bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/...  serve 
-        --except-tags post_wheel_build,gpu,worker-container,xcommit
+        --except-tags post_wheel_build,gpu,worker-container,ha_integration
         --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
         --build-name servebuild --test-env=EXPECTED_PYTHON_VERSION=3.8
     depends_on: "servebuild"
@@ -36,7 +36,7 @@ steps:
     soft_fail: true
     commands:
       - bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/...  serve 
-        --except-tags post_wheel_build,gpu,worker-container,xcommit
+        --except-tags post_wheel_build,gpu,worker-container,ha_integration
         --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
         --build-name servepydantic1build --test-env=EXPECTED_PYTHON_VERSION=3.8 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
     depends_on: servepydantic1build
@@ -51,7 +51,7 @@ steps:
     instance_type: large
     commands:
       - bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/...  serve
-        --except-tags post_wheel_build,gpu,worker-container,xcommit
+        --except-tags post_wheel_build,gpu,worker-container,ha_integration
         --workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
         --build-name servepython311build --test-env=EXPECTED_PYTHON_VERSION=3.11
     depends_on: servepython311build
@@ -147,6 +147,22 @@ steps:
         --parallelism-per-worker 3
     depends_on: servebuild
 
+  - label: ":ray-serve: serve: HA integration tests"
+    tags:
+      - serve
+      - python
+    instance_type: medium
+    commands:
+      - bazel run //ci/ray_ci:build_in_docker -- docker --python-version 3.8 --platform cpu --canonical-tag ha_integration
+      - docker tag rayproject/ray:ha_integration ray_ci:v1
+      - bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/tests/... serve
+        --only-tags ha_integration
+    depends_on:
+      - manylinux
+      - forge
+      - raycpubase
+      - servebuild
+
   - label: ":ray-serve: serve: doc gpu tests"
     tags: 
       - serve

diff --git a/python/ray/serve/tests/BUILD b/python/ray/serve/tests/BUILD
@@ -167,6 +167,6 @@ py_test(
     name = "test_serve_ha",
     srcs = ["test_serve_ha.py"],
     size = "medium",
-    tags = ["exclusive", "team:serve", "xcommit"],
+    tags = ["exclusive", "team:serve", "ha_integration"],
     deps = ["//python/ray/serve:serve_lib", ":conftest", ":common"],
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,6 +36,7 @@ steps: @@
           - python
           - docker
           - tune
+          - serve
         wanda: ci/docker/ray.cpu.base.wanda.yaml
         matrix:
           - "3.8"
@@ Expand Down @@