Skip to content

Commit 034ca06

Browse files
aslonnieaslonnie
authored
cherrypick #50816 and #50829 (#50834)
Signed-off-by: Lonnie Liu <lonnie@anyscale.com>
1 parent acda02d commit 034ca06

8 files changed

+37
-29
lines changed

‎release/ray_release/environments/aws.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ANYSCALE_HOST=https://console.anyscale-staging.com
22
RELEASE_AWS_ANYSCALE_SECRET_ARN="arn:aws:secretsmanager:us-west-2:029272617770:secret:release-automation/anyscale-staging-token20231008005227440600000001-JTgxb0"
33
RELEASE_DEFAULT_CLOUD_ID="cld_kvedZWag2qA8i5BjxUevf5i7"
4-
RELEASE_DEFAULT_PROJECT="prj_rw3kzbqsehh4a6klka7j616fgb"
5-
ANYSCALE_PROJECT="prj_rw3kzbqsehh4a6klka7j616fgb"
4+
RELEASE_DEFAULT_PROJECT="prj_92c7b71w55flm6gv6imv4m6vqg"
5+
ANYSCALE_PROJECT="prj_92c7b71w55flm6gv6imv4m6vqg"

‎release/ray_release/environments/aws_perf.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ANYSCALE_HOST=https://console.anyscale-staging.com
22
RELEASE_AWS_ANYSCALE_SECRET_ARN="arn:aws:secretsmanager:us-west-2:029272617770:secret:release-automation/anyscale-staging-token20231008005227440600000001-JTgxb0"
33
RELEASE_DEFAULT_CLOUD_ID="cld_kvedZWag2qA8i5BjxUevf5i7"
4-
RELEASE_DEFAULT_PROJECT="prj_qC3ZfndQWYYjx2cz8KWGNUL4"
5-
ANYSCALE_PROJECT="prj_qC3ZfndQWYYjx2cz8KWGNUL4"
4+
RELEASE_DEFAULT_PROJECT="prj_6rfevmf12tbsbd6g3al5f6zssh"
5+
ANYSCALE_PROJECT="prj_6rfevmf12tbsbd6g3al5f6zssh"

‎release/ray_release/environments/gce.env

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ ANYSCALE_HOST=https://console.anyscale-staging.com
22
ANYSCALE_CLOUD_STORAGE_PROVIDER=gs
33
RELEASE_AWS_ANYSCALE_SECRET_ARN="arn:aws:secretsmanager:us-west-2:029272617770:secret:release-automation/anyscale-staging-token20231008005227440600000001-JTgxb0"
44
RELEASE_DEFAULT_CLOUD_ID="cld_vy7xqacrvddvbuy95auinvuqmt"
5-
RELEASE_DEFAULT_PROJECT="prj_qC3ZfndQWYYjx2cz8KWGNUL4"
6-
ANYSCALE_PROJECT="prj_qC3ZfndQWYYjx2cz8KWGNUL4"
5+
RELEASE_DEFAULT_PROJECT="prj_xqmpk8ps6civt438u1hp5pi88g"
6+
ANYSCALE_PROJECT="prj_xqmpk8ps6civt438u1hp5pi88g"
77
GOOGLE_CLOUD_PROJECT="anyscale-oss-ci"

‎release/ray_release/job_manager/anyscale_job_manager.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import anyscale
77
from anyscale.sdk.anyscale_client.models import (
88
CreateProductionJob,
9+
CreateProductionJobConfig,
910
HaJobStates,
1011
)
1112
from ray_release.anyscale_util import get_cluster_name
@@ -71,20 +72,19 @@ def _run_job(
7172
runtime_env["upload_path"] = upload_path
7273

7374
try:
74-
job_response = anyscale_client.create_job(
75-
CreateProductionJob(
76-
name=self.cluster_manager.cluster_name,
77-
description=f"Smoke test: {self.cluster_manager.smoke_test}",
78-
project_id=self.cluster_manager.project_id,
79-
config=dict(
80-
entrypoint=cmd_to_run,
81-
runtime_env=runtime_env,
82-
build_id=self.cluster_manager.cluster_env_build_id,
83-
compute_config_id=self.cluster_manager.cluster_compute_id,
84-
max_retries=0,
85-
),
75+
job_request = CreateProductionJob(
76+
name=self.cluster_manager.cluster_name,
77+
description=f"Smoke test: {self.cluster_manager.smoke_test}",
78+
project_id=self.cluster_manager.project_id,
79+
config=CreateProductionJobConfig(
80+
entrypoint=cmd_to_run,
81+
runtime_env=runtime_env,
82+
build_id=self.cluster_manager.cluster_env_build_id,
83+
compute_config_id=self.cluster_manager.cluster_compute_id,
84+
max_retries=0,
8685
),
8786
)
87+
job_response = anyscale_client.create_job(job_request)
8888
except Exception as e:
8989
raise JobStartupFailed(
9090
"Error starting job with name "

‎release/requirements_buildkite.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Requirements to run release tests from buildkite (client dependencies will be installed separately)
22
# Copy anyscale pin to requirements.txt and util.py
3-
anyscale >= 0.24.62
4-
bazel-runfiles
53
aioboto3
4+
anyscale >= 0.26.1
5+
bazel-runfiles
66
boto3
77
click
88
freezegun
@@ -16,10 +16,10 @@ PyGithub
1616
requests
1717
twine == 5.0.0
1818
docker >= 7.1.0
19+
aws_requests_auth
1920

2021
# Below are requirements only used by ray_ci
2122
tzdata
22-
aws_requests_auth
2323
requests >= 2.31.0
2424
-r requirements-doc.txt
2525

‎release/requirements_buildkite.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,9 @@ anyio==4.4.0 \
118118
# via
119119
# starlette
120120
# watchfiles
121-
anyscale==0.24.62 \
122-
--hash=sha256:a07115a2a65ffc79852d9d65a8b313987d8850d93f2c383c394ac9af7f08485f
121+
anyscale==0.26.1 \
122+
--hash=sha256:4da5e801e7c86848554575493c0a1f466bad58a1a11c601e21b850f6c4fbb9c4 \
123+
--hash=sha256:56fd7f7b4747bf6ec2103ee811c0f90ed3407f9dbf91d5519d9053bce12e88fb
123124
# via -r release/requirements_buildkite.in
124125
appnope==0.1.4 \
125126
--hash=sha256:1de3860566df9caf38f01f86f65e0e13e379af54f9e4bee1e66b48f2efffd1ee \

‎release/run_release_test.sh

+6-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,12 @@ if [ -n "${RAY_COMMIT_OF_WHEEL-}" ]; then
4949
fi
5050

5151
if [ -z "${NO_INSTALL}" ]; then
52-
pip install -r ./requirements_buildkite.txt
53-
pip install --no-deps -e .
52+
# Strip the hashes from the constraint file
53+
# TODO(aslonnie): use bazel run..
54+
grep '==' ./requirements_buildkite.txt > /tmp/requirements_buildkite_nohash.txt
55+
sed -i 's/ \\//' /tmp/requirements_buildkite_nohash.txt # Remove ending slashes.
56+
sed -i 's/\[.*\]//g' /tmp/requirements_buildkite_nohash.txt # Remove extras.
57+
pip install -c /tmp/requirements_buildkite_nohash.txt -e .
5458
fi
5559

5660
RETRY_NUM=0

‎release/setup.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,23 @@
1414
url="https://github.com/ray-project/ray",
1515
install_requires=[
1616
# Keep this in sync with requirements_buildkite.in
17-
"anyscale",
17+
"aioboto3",
18+
"anyscale >= 0.26.1",
19+
"aws_requests_auth",
1820
"bazel-runfiles",
1921
"boto3",
2022
"click",
2123
"freezegun",
2224
"google-cloud-storage",
2325
"jinja2",
24-
"protobuf",
25-
"pydantic >= 2.5.0",
26+
"protobuf >= 3.15.3, != 3.19.5",
2627
"pytest",
2728
"pyyaml",
2829
"pybuildkite",
30+
"pydantic >= 2.5.0",
2931
"PyGithub",
3032
"requests",
31-
"retry",
33+
"twine == 5.0.0",
34+
"docker >= 7.1.0",
3235
],
3336
)

0 commit comments

Comments
 (0)