Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release Test] Remove runtime env usage from release tests #33288

Merged
merged 11 commits into from
Mar 17, 2023
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
3 changes: 3 additions & 0 deletions release/ray_release/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ class Test(dict):
RELEASE_PACKAGE_DIR, "ray_release", "schema.json"
)

DEFAULT_CORE_RUN_TYPE = "sdk_command"
DEFAULT_CORE_ENV_TYPE = "staging_v1"


def read_and_validate_release_test_collection(
config_file: str, schema_file: Optional[str] = None
Expand Down
1 change: 0 additions & 1 deletion release/ray_release/glue.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ def run_release_test(
os.chdir(new_wd)

start_time = time.monotonic()

run_type = test["run"].get("type", DEFAULT_RUN_TYPE)

# Workaround while Anyscale Jobs don't support leaving cluster alive
Expand Down
9 changes: 9 additions & 0 deletions release/ray_release/scripts/run_release_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
from ray_release.config import (
DEFAULT_PYTHON_VERSION,
DEFAULT_WHEEL_WAIT_TIMEOUT,
DEFAULT_CORE_RUN_TYPE,
DEFAULT_CORE_ENV_TYPE,
as_smoke_test,
find_test,
parse_python_version,
Expand Down Expand Up @@ -116,6 +118,13 @@ def main(
if smoke_test:
test = as_smoke_test(test)

# Several core tests have perf regression from V2 Job submission Runner.
# So we stick to the original implementation for now.
team = test.get("team")
if team == "core":
test["run"]["type"] = test["run"].get("type", DEFAULT_CORE_RUN_TYPE)
test["env"] = test.get("env", DEFAULT_CORE_ENV_TYPE)

env_to_use = env or test.get("env", DEFAULT_ENVIRONMENT)
env_dict = load_environment(env_to_use)
populate_os_env(env_dict)
Expand Down