Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .buildkite/build.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,14 @@ steps:
- "3.9"
- "3.10"
- "3.11"

- label: ":tapioca: smoke test build-docker.sh"
tags:
- python_dependencies
- docker
- oss
instance_type: medium
soft_fail: true
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CC: @aslonnie, skipping this test as per offline discussion

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds good.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

context: the test is using an old, released wheel file but with current requirement_compiled.txt file.

REEf team will fix/refactor this test as a follow up

commands:
- export WHEEL_URL="https://files.pythonhosted.org/packages/7e/7c/3544cca730265bb6f7a4900b7b7018c08ce5ec89bf7b6102901fe0bcd67b/ray-2.44.1-cp39-cp39-manylinux2014_x86_64.whl"
- export CPP_WHEEL_URL="https://files.pythonhosted.org/packages/50/ae/c094818fd526bfb0a361a76bda5708a73cbc888b51edfc7d6aab9de837cd/ray_cpp-2.44.1-cp39-cp39-manylinux2014_x86_64.whl"
Expand Down
21 changes: 17 additions & 4 deletions .buildkite/serve.rayci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ steps:
wanda: ci/docker/servepydantic1.build.wanda.yaml
tags: cibase

- name: servetracingbuild
wanda: ci/docker/servetracing.build.wanda.yaml

- name: minbuild-serve
label: "wanda: minbuild-{{matrix}}-py39"
wanda: ci/docker/min.build.wanda.yaml
Expand All @@ -41,7 +44,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,ha_integration
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
--build-name servebuild --test-env=EXPECTED_PYTHON_VERSION=3.9
depends_on: "servebuild"
Expand All @@ -55,7 +58,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,ha_integration
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
--build-name servepydantic1build --test-env=EXPECTED_PYTHON_VERSION=3.9 --test-env=EXPECTED_PYDANTIC_VERSION=1.10.12
depends_on: servepydantic1build
Expand All @@ -69,7 +72,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,ha_integration
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
--workers "$${BUILDKITE_PARALLEL_JOB_COUNT}" --worker-id "$${BUILDKITE_PARALLEL_JOB}" --parallelism-per-worker 3
--build-name servebuild --test-env=EXPECTED_PYTHON_VERSION=3.9 --test-env=RAY_SERVE_RUN_USER_CODE_IN_SEPARATE_THREAD=0
depends_on: "servebuild"
Expand All @@ -82,7 +85,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,ha_integration
--except-tags post_wheel_build,gpu,ha_integration,serve_tracing
--workers 2 --worker-id {{matrix.worker_id}} --parallelism-per-worker 3
--python-version {{matrix.python}}
--test-env=EXPECTED_PYTHON_VERSION={{matrix.python}}
Expand Down Expand Up @@ -185,6 +188,16 @@ steps:
- raycpubase
- servebuild

- label: ":ray-serve: serve: tracing tests"
tags:
- serve
- python
instance_type: medium
commands:
- bazel run //ci/ray_ci:test_in_docker -- //python/ray/serve/... //python/ray/tests/... serve
--only-tags serve_tracing --build-name servetracingbuild
depends_on: servetracingbuild

- label: ":ray-serve: serve: doc gpu tests"
tags:
- serve
Expand Down
10 changes: 10 additions & 0 deletions ci/docker/serve.build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
ARG DOCKER_IMAGE_BASE_BUILD=cr.ray.io/rayproject/oss-ci-base_build
FROM $DOCKER_IMAGE_BASE_BUILD

ARG ENABLE_TRACING
ARG PYDANTIC_VERSION
ARG PYTHON

Expand Down Expand Up @@ -35,4 +36,13 @@ else
echo "Not installing Pydantic from source"
fi

if [[ "${ENABLE_TRACING-}" == "1" ]]; then
# Install tracing dependencies if requested. Intentionally, we do not use
# requirements_compiled.txt as the constraint file. They are not compatible with
# a few packages in that file (e.g. requiring an ugprade to protobuf 5+).
pip install opentelemetry-exporter-otlp==1.34.1
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pinned opentelemetry-exporter-otlp

else
echo "Not installing tracing dependencies"
fi

EOF
11 changes: 11 additions & 0 deletions ci/docker/servetracing.build.wanda.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: "servetracingbuild"
froms: ["cr.ray.io/rayproject/oss-ci-base_build"]
dockerfile: ci/docker/serve.build.Dockerfile
srcs:
- python/requirements.txt
- python/requirements_compiled.txt
- python/requirements/test-requirements.txt
build_args:
- ENABLE_TRACING=1
tags:
- cr.ray.io/rayproject/servetracingbuild
1 change: 1 addition & 0 deletions python/ray/tests/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -1226,6 +1226,7 @@ py_test(
"exclusive",
"medium_size_python_tests_k_to_z",
"no_windows",
"serve_tracing",
"team:serve",
],
deps = [
Expand Down
6 changes: 3 additions & 3 deletions python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@ smart_open
lz4
numpy>=1.20
aiorwlock
opentelemetry-exporter-otlp
scipy
colorful
rich
opentelemetry-sdk
opentelemetry-sdk>=1.30.0
opentelemetry-api
opentelemetry-exporter-prometheus
opentelemetry-proto
fastapi
gymnasium==1.0.0
virtualenv!=20.21.1,>=20.0.24
opentelemetry-api
opencensus
aiohttp_cors
dm_tree
Expand Down
3 changes: 0 additions & 3 deletions python/requirements/cloud-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
jupyterlab==3.6.1
ipywidgets
opentelemetry-api
opentelemetry-sdk
opentelemetry-exporter-otlp
google-cloud-storage
grpcio>=1.66.1
grpcio-tools
Expand Down
5 changes: 2 additions & 3 deletions python/requirements/test-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ moto[s3,server]==4.2.12
mypy==1.7.0
numba==0.59.1
openpyxl==3.0.10
opentelemetry-api==1.26.0
opentelemetry-sdk==1.26.0
opentelemetry-exporter-otlp>=1.26.0
opentelemetry-api
opentelemetry-sdk
opencensus-proto==0.1.0
pexpect==4.8.0
Pillow==10.3.0; platform_system != "Windows"
Expand Down
47 changes: 8 additions & 39 deletions python/requirements_compiled.txt
Original file line number Diff line number Diff line change
Expand Up @@ -407,12 +407,6 @@ delta-sharing==1.0.5
# via -r python/requirements/ml/data-test-requirements.txt
deltalake==0.9.0
# via -r python/requirements/ml/data-test-requirements.txt
deprecated==1.2.18
# via
# opentelemetry-api
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
# opentelemetry-semantic-conventions
dill==0.3.7
# via
# datasets
Expand Down Expand Up @@ -652,8 +646,6 @@ googleapis-common-protos==1.61.0
# via
# google-api-core
# grpcio-status
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
# tensorflow-metadata
gpy==1.13.1
# via -r python/requirements/ml/tune-test-requirements.txt
Expand Down Expand Up @@ -686,7 +678,6 @@ grpcio==1.66.2 ; sys_platform != "darwin"
# grpcio-tools
# mlagents-envs
# opencensus-proto
# opentelemetry-exporter-otlp-proto-grpc
# tensorboard
# tensorflow
grpcio-status==1.48.2
Expand Down Expand Up @@ -1310,47 +1301,25 @@ opencv-python-headless==4.9.0.80
# via -r python/requirements/ml/rllib-test-requirements.txt
openpyxl==3.0.10
# via -r python/requirements/test-requirements.txt
opentelemetry-api==1.26.0
opentelemetry-api==1.34.1
# via
# -r python/requirements.txt
# -r python/requirements/cloud-requirements.txt
# -r python/requirements/test-requirements.txt
# mlflow-skinny
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
# opentelemetry-exporter-prometheus
# opentelemetry-sdk
# opentelemetry-semantic-conventions
opentelemetry-exporter-otlp==1.26.0
# via
# -r python/requirements.txt
# -r python/requirements/cloud-requirements.txt
# -r python/requirements/test-requirements.txt
opentelemetry-exporter-otlp-proto-common==1.26.0
# via
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
opentelemetry-exporter-otlp-proto-grpc==1.26.0
# via opentelemetry-exporter-otlp
opentelemetry-exporter-otlp-proto-http==1.26.0
# via opentelemetry-exporter-otlp
opentelemetry-exporter-prometheus==0.47b0
opentelemetry-exporter-prometheus==0.55b1
# via -r python/requirements.txt
opentelemetry-proto==1.26.0
# via
# opentelemetry-exporter-otlp-proto-common
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
opentelemetry-sdk==1.26.0
opentelemetry-proto==1.27.0
# via -r python/requirements.txt
opentelemetry-sdk==1.34.1
# via
# -r python/requirements.txt
# -r python/requirements/cloud-requirements.txt
# -r python/requirements/test-requirements.txt
# mlflow-skinny
# opentelemetry-exporter-otlp-proto-grpc
# opentelemetry-exporter-otlp-proto-http
# opentelemetry-exporter-prometheus
opentelemetry-semantic-conventions==0.47b0
opentelemetry-semantic-conventions==0.55b1
# via opentelemetry-sdk
opt-einsum==3.3.0
# via
Expand Down Expand Up @@ -1885,7 +1854,6 @@ requests==2.32.3
# moto
# msal
# msrest
# opentelemetry-exporter-otlp-proto-http
# pyiceberg
# ray
# requests-oauthlib
Expand Down Expand Up @@ -2389,7 +2357,9 @@ typing-extensions==4.12.2
# mypy
# myst-nb
# nevergrad
# opentelemetry-api
# opentelemetry-sdk
# opentelemetry-semantic-conventions
# pydantic
# pydantic-core
# pyopenssl
Expand Down Expand Up @@ -2510,7 +2480,6 @@ wrapt==1.14.1
# aiobotocore
# aws-xray-sdk
# comet-ml
# deprecated
# tensorflow
# tensorflow-datasets
wurlitzer==3.1.1
Expand Down
Loading