2022-02-16 17:35:02 +00:00
|
|
|
import os
|
2022-03-18 11:34:05 +00:00
|
|
|
import sys
|
2022-02-16 17:35:02 +00:00
|
|
|
import unittest
|
|
|
|
from typing import Dict
|
|
|
|
from unittest.mock import patch
|
|
|
|
|
2022-03-02 16:35:54 +01:00
|
|
|
from ray_release.buildkite.concurrency import (
|
|
|
|
get_test_resources_from_cluster_compute,
|
|
|
|
get_concurrency_group,
|
|
|
|
CONCURRENY_GROUPS,
|
|
|
|
)
|
2022-02-16 17:35:02 +00:00
|
|
|
from ray_release.buildkite.filter import filter_tests, group_tests
|
|
|
|
from ray_release.buildkite.settings import (
|
|
|
|
split_ray_repo_str,
|
|
|
|
get_default_settings,
|
|
|
|
update_settings_from_environment,
|
|
|
|
Frequency,
|
|
|
|
update_settings_from_buildkite,
|
2022-03-02 16:35:54 +01:00
|
|
|
Priority,
|
2022-02-16 17:35:02 +00:00
|
|
|
)
|
2022-02-28 21:05:01 +01:00
|
|
|
from ray_release.buildkite.step import get_step
|
2022-02-16 17:35:02 +00:00
|
|
|
from ray_release.config import Test
|
|
|
|
from ray_release.exception import ReleaseTestConfigError
|
2022-03-14 17:24:13 +00:00
|
|
|
from ray_release.tests.test_glue import MockReturn
|
2022-02-16 17:35:02 +00:00
|
|
|
from ray_release.wheels import (
|
|
|
|
DEFAULT_BRANCH,
|
|
|
|
)
|
|
|
|
|
|
|
|
|
2022-03-14 17:24:13 +00:00
|
|
|
class MockBuildkiteAgent:
|
2022-02-16 17:35:02 +00:00
|
|
|
def __init__(self, return_dict: Dict):
|
|
|
|
self.return_dict = return_dict
|
|
|
|
|
|
|
|
def __call__(self, key: str):
|
|
|
|
return self.return_dict.get(key, None)
|
|
|
|
|
|
|
|
|
2022-03-14 17:24:13 +00:00
|
|
|
class MockBuildkitePythonAPI(MockReturn):
|
|
|
|
def builds(self):
|
|
|
|
return self
|
|
|
|
|
|
|
|
def artifacts(self):
|
|
|
|
return self
|
|
|
|
|
|
|
|
|
2022-02-16 17:35:02 +00:00
|
|
|
class BuildkiteSettingsTest(unittest.TestCase):
|
|
|
|
def setUp(self) -> None:
|
|
|
|
self.buildkite = {}
|
2022-03-14 17:24:13 +00:00
|
|
|
self.buildkite_mock = MockBuildkiteAgent(self.buildkite)
|
2022-02-16 17:35:02 +00:00
|
|
|
|
|
|
|
def testSplitRayRepoStr(self):
|
|
|
|
url, branch = split_ray_repo_str("https://github.com/ray-project/ray.git")
|
|
|
|
self.assertEqual(url, "https://github.com/ray-project/ray.git")
|
|
|
|
self.assertEqual(branch, DEFAULT_BRANCH)
|
|
|
|
|
|
|
|
url, branch = split_ray_repo_str(
|
|
|
|
"https://github.com/ray-project/ray/tree/branch/sub"
|
|
|
|
)
|
|
|
|
self.assertEqual(url, "https://github.com/ray-project/ray.git")
|
|
|
|
self.assertEqual(branch, "branch/sub")
|
|
|
|
|
|
|
|
url, branch = split_ray_repo_str("https://github.com/user/ray/tree/branch/sub")
|
|
|
|
self.assertEqual(url, "https://github.com/user/ray.git")
|
|
|
|
self.assertEqual(branch, "branch/sub")
|
|
|
|
|
|
|
|
url, branch = split_ray_repo_str("ray-project:branch/sub")
|
|
|
|
self.assertEqual(url, "https://github.com/ray-project/ray.git")
|
|
|
|
self.assertEqual(branch, "branch/sub")
|
|
|
|
|
|
|
|
url, branch = split_ray_repo_str("user:branch/sub")
|
|
|
|
self.assertEqual(url, "https://github.com/user/ray.git")
|
|
|
|
self.assertEqual(branch, "branch/sub")
|
|
|
|
|
|
|
|
url, branch = split_ray_repo_str("user")
|
|
|
|
self.assertEqual(url, "https://github.com/user/ray.git")
|
|
|
|
self.assertEqual(branch, DEFAULT_BRANCH)
|
|
|
|
|
|
|
|
def testSettingsOverrideEnv(self):
|
|
|
|
settings = get_default_settings()
|
|
|
|
|
|
|
|
# With no environment variables, default settings shouldn't be updated
|
|
|
|
updated_settings = settings.copy()
|
|
|
|
update_settings_from_environment(updated_settings)
|
|
|
|
|
|
|
|
self.assertDictEqual(settings, updated_settings)
|
|
|
|
|
|
|
|
# Invalid frequency
|
|
|
|
os.environ["RELEASE_FREQUENCY"] = "invalid"
|
|
|
|
updated_settings = settings.copy()
|
|
|
|
with self.assertRaises(ReleaseTestConfigError):
|
|
|
|
update_settings_from_environment(updated_settings)
|
|
|
|
|
2022-03-02 16:35:54 +01:00
|
|
|
# Invalid priority
|
|
|
|
os.environ["RELEASE_PRIORITY"] = "invalid"
|
|
|
|
updated_settings = settings.copy()
|
|
|
|
with self.assertRaises(ReleaseTestConfigError):
|
|
|
|
update_settings_from_environment(updated_settings)
|
|
|
|
|
2022-02-16 17:35:02 +00:00
|
|
|
os.environ["RELEASE_FREQUENCY"] = "nightly"
|
|
|
|
os.environ["RAY_TEST_REPO"] = "https://github.com/user/ray.git"
|
|
|
|
os.environ["RAY_TEST_BRANCH"] = "sub/branch"
|
|
|
|
os.environ["RAY_WHEELS"] = "custom-wheels"
|
|
|
|
os.environ["TEST_NAME"] = "name_filter"
|
2022-03-02 16:35:54 +01:00
|
|
|
os.environ["RELEASE_PRIORITY"] = "manual"
|
2022-02-16 17:35:02 +00:00
|
|
|
updated_settings = settings.copy()
|
|
|
|
update_settings_from_environment(updated_settings)
|
|
|
|
|
|
|
|
self.assertDictEqual(
|
|
|
|
updated_settings,
|
|
|
|
{
|
|
|
|
"frequency": Frequency.NIGHTLY,
|
|
|
|
"test_name_filter": "name_filter",
|
|
|
|
"ray_wheels": "custom-wheels",
|
|
|
|
"ray_test_repo": "https://github.com/user/ray.git",
|
|
|
|
"ray_test_branch": "sub/branch",
|
2022-03-02 16:35:54 +01:00
|
|
|
"priority": Priority.MANUAL,
|
|
|
|
"no_concurrency_limit": False,
|
2022-02-16 17:35:02 +00:00
|
|
|
},
|
|
|
|
)
|
|
|
|
|
|
|
|
def testSettingsOverrideBuildkite(self):
|
|
|
|
settings = get_default_settings()
|
|
|
|
|
|
|
|
with patch(
|
|
|
|
"ray_release.buildkite.settings.get_buildkite_prompt_value",
|
|
|
|
self.buildkite_mock,
|
|
|
|
):
|
|
|
|
|
|
|
|
# With no buildkite variables, default settings shouldn't be updated
|
|
|
|
updated_settings = settings.copy()
|
|
|
|
update_settings_from_buildkite(updated_settings)
|
|
|
|
|
|
|
|
self.assertDictEqual(settings, updated_settings)
|
|
|
|
|
|
|
|
# Invalid frequency
|
|
|
|
self.buildkite["release-frequency"] = "invalid"
|
|
|
|
updated_settings = settings.copy()
|
|
|
|
with self.assertRaises(ReleaseTestConfigError):
|
|
|
|
update_settings_from_buildkite(updated_settings)
|
|
|
|
|
2022-03-02 16:35:54 +01:00
|
|
|
# Invalid priority
|
|
|
|
self.buildkite["release-priority"] = "invalid"
|
|
|
|
updated_settings = settings.copy()
|
|
|
|
with self.assertRaises(ReleaseTestConfigError):
|
|
|
|
update_settings_from_buildkite(updated_settings)
|
|
|
|
|
2022-02-16 17:35:02 +00:00
|
|
|
self.buildkite["release-frequency"] = "nightly"
|
|
|
|
self.buildkite["release-ray-test-repo-branch"] = "user:sub/branch"
|
|
|
|
self.buildkite["release-ray-wheels"] = "custom-wheels"
|
|
|
|
self.buildkite["release-test-name"] = "name_filter"
|
2022-03-02 16:35:54 +01:00
|
|
|
self.buildkite["release-priority"] = "manual"
|
2022-02-16 17:35:02 +00:00
|
|
|
updated_settings = settings.copy()
|
|
|
|
update_settings_from_buildkite(updated_settings)
|
|
|
|
|
|
|
|
self.assertDictEqual(
|
|
|
|
updated_settings,
|
|
|
|
{
|
|
|
|
"frequency": Frequency.NIGHTLY,
|
|
|
|
"test_name_filter": "name_filter",
|
|
|
|
"ray_wheels": "custom-wheels",
|
|
|
|
"ray_test_repo": "https://github.com/user/ray.git",
|
|
|
|
"ray_test_branch": "sub/branch",
|
2022-03-02 16:35:54 +01:00
|
|
|
"priority": Priority.MANUAL,
|
|
|
|
"no_concurrency_limit": False,
|
2022-02-16 17:35:02 +00:00
|
|
|
},
|
|
|
|
)
|
|
|
|
|
|
|
|
def _filter_names_smoke(self, *args, **kwargs):
|
|
|
|
filtered = filter_tests(*args, **kwargs)
|
|
|
|
return [(t[0]["name"], t[1]) for t in filtered]
|
|
|
|
|
|
|
|
def testFilterTests(self):
|
|
|
|
tests = [
|
|
|
|
Test(
|
|
|
|
{
|
|
|
|
"name": "test_1",
|
|
|
|
"frequency": "nightly",
|
|
|
|
"smoke_test": {"frequency": "nightly"},
|
|
|
|
}
|
|
|
|
),
|
|
|
|
Test(
|
|
|
|
{
|
|
|
|
"name": "test_2",
|
|
|
|
"frequency": "weekly",
|
|
|
|
"smoke_test": {"frequency": "nightly"},
|
|
|
|
}
|
|
|
|
),
|
|
|
|
Test({"name": "other_1", "frequency": "weekly"}),
|
|
|
|
Test(
|
|
|
|
{
|
|
|
|
"name": "other_2",
|
|
|
|
"frequency": "nightly",
|
|
|
|
"smoke_test": {"frequency": "multi"},
|
|
|
|
}
|
|
|
|
),
|
|
|
|
Test({"name": "other_3", "frequency": "disabled"}),
|
|
|
|
Test({"name": "test_3", "frequency": "nightly"}),
|
|
|
|
]
|
|
|
|
|
|
|
|
filtered = self._filter_names_smoke(tests, frequency=Frequency.ANY)
|
|
|
|
self.assertSequenceEqual(
|
|
|
|
filtered,
|
|
|
|
[
|
|
|
|
("test_1", False),
|
|
|
|
("test_2", False),
|
|
|
|
("other_1", False),
|
|
|
|
("other_2", False),
|
|
|
|
("test_3", False),
|
|
|
|
],
|
|
|
|
)
|
|
|
|
|
|
|
|
filtered = self._filter_names_smoke(tests, frequency=Frequency.NIGHTLY)
|
|
|
|
self.assertSequenceEqual(
|
|
|
|
filtered,
|
|
|
|
[
|
|
|
|
("test_1", False),
|
|
|
|
("test_2", True),
|
|
|
|
("other_2", False),
|
|
|
|
("test_3", False),
|
|
|
|
],
|
|
|
|
)
|
|
|
|
|
|
|
|
filtered = self._filter_names_smoke(tests, frequency=Frequency.WEEKLY)
|
|
|
|
self.assertSequenceEqual(filtered, [("test_2", False), ("other_1", False)])
|
|
|
|
|
|
|
|
filtered = self._filter_names_smoke(
|
|
|
|
tests, frequency=Frequency.NIGHTLY, test_name_filter="other"
|
|
|
|
)
|
|
|
|
self.assertSequenceEqual(
|
|
|
|
filtered,
|
|
|
|
[
|
|
|
|
("other_2", False),
|
|
|
|
],
|
|
|
|
)
|
|
|
|
|
|
|
|
filtered = self._filter_names_smoke(
|
|
|
|
tests, frequency=Frequency.NIGHTLY, test_name_filter="test"
|
|
|
|
)
|
|
|
|
self.assertSequenceEqual(
|
|
|
|
filtered, [("test_1", False), ("test_2", True), ("test_3", False)]
|
|
|
|
)
|
|
|
|
|
|
|
|
def testGroupTests(self):
|
|
|
|
tests = [
|
|
|
|
(Test(name="x1", group="x"), False),
|
|
|
|
(Test(name="x2", group="x"), False),
|
|
|
|
(Test(name="y1", group="y"), False),
|
|
|
|
(Test(name="ungrouped"), False),
|
|
|
|
(Test(name="x3", group="x"), False),
|
|
|
|
]
|
|
|
|
|
|
|
|
grouped = group_tests(tests)
|
|
|
|
self.assertEqual(len(grouped), 3) # Three groups
|
|
|
|
self.assertEqual(len(grouped["x"]), 3)
|
|
|
|
self.assertSequenceEqual(
|
|
|
|
[t["name"] for t, _ in grouped["x"]], ["x1", "x2", "x3"]
|
|
|
|
)
|
|
|
|
self.assertEqual(len(grouped["y"]), 1)
|
2022-02-28 21:05:01 +01:00
|
|
|
|
|
|
|
def testGetStep(self):
|
|
|
|
test = Test(
|
|
|
|
{
|
|
|
|
"name": "test",
|
|
|
|
"frequency": "nightly",
|
|
|
|
"run": {"script": "test_script.py"},
|
|
|
|
"smoke_test": {"frequency": "multi"},
|
|
|
|
}
|
|
|
|
)
|
|
|
|
|
|
|
|
step = get_step(test, smoke_test=False)
|
|
|
|
self.assertNotIn("--smoke-test", step["command"])
|
|
|
|
|
|
|
|
step = get_step(test, smoke_test=True)
|
|
|
|
self.assertIn("--smoke-test", step["command"])
|
2022-03-02 16:35:54 +01:00
|
|
|
|
|
|
|
step = get_step(test, priority_val=20)
|
|
|
|
self.assertEqual(step["priority"], 20)
|
|
|
|
|
|
|
|
def testInstanceResources(self):
|
|
|
|
# AWS instances
|
|
|
|
cpus, gpus = get_test_resources_from_cluster_compute(
|
|
|
|
{
|
|
|
|
"head_node_type": {"instance_type": "m5.4xlarge"}, # 16 CPUs, 0 GPUs
|
|
|
|
"worker_node_types": [
|
|
|
|
{
|
|
|
|
"instance_type": "m5.8xlarge", # 32 CPUS, 0 GPUs
|
|
|
|
"max_workers": 4,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"instance_type": "g3.8xlarge", # 32 CPUs, 2 GPUs
|
|
|
|
"min_workers": 8,
|
|
|
|
},
|
|
|
|
],
|
|
|
|
}
|
|
|
|
)
|
|
|
|
self.assertEqual(cpus, 16 + 32 * 4 + 32 * 8)
|
|
|
|
self.assertEqual(gpus, 2 * 8)
|
|
|
|
|
|
|
|
cpus, gpus = get_test_resources_from_cluster_compute(
|
|
|
|
{
|
|
|
|
"head_node_type": {
|
|
|
|
"instance_type": "n1-standard-16" # 16 CPUs, 0 GPUs
|
|
|
|
},
|
|
|
|
"worker_node_types": [
|
|
|
|
{
|
|
|
|
"instance_type": "random-str-xxx-32", # 32 CPUS, 0 GPUs
|
|
|
|
"max_workers": 4,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
"instance_type": "a2-highgpu-2g", # 24 CPUs, 2 GPUs
|
|
|
|
"min_workers": 8,
|
|
|
|
},
|
|
|
|
],
|
|
|
|
}
|
|
|
|
)
|
|
|
|
self.assertEqual(cpus, 16 + 32 * 4 + 24 * 8)
|
|
|
|
self.assertEqual(gpus, 2 * 8)
|
|
|
|
|
|
|
|
def testConcurrencyGroups(self):
|
|
|
|
def _return(ret):
|
|
|
|
def _inner(*args, **kwargs):
|
|
|
|
return ret
|
|
|
|
|
|
|
|
return _inner
|
|
|
|
|
|
|
|
test = Test(
|
|
|
|
{
|
|
|
|
"name": "test_1",
|
|
|
|
}
|
|
|
|
)
|
|
|
|
|
|
|
|
def test_concurrency(cpu, gpu, group):
|
|
|
|
with patch(
|
|
|
|
"ray_release.buildkite.concurrency.get_test_resources",
|
|
|
|
_return((cpu, gpu)),
|
|
|
|
):
|
|
|
|
group_name, limit = get_concurrency_group(test)
|
|
|
|
self.assertEqual(group_name, group)
|
|
|
|
self.assertEqual(limit, CONCURRENY_GROUPS[group_name])
|
|
|
|
|
2022-03-11 18:19:38 +00:00
|
|
|
test_concurrency(12800, 9, "large-gpu")
|
|
|
|
test_concurrency(12800, 8, "small-gpu")
|
2022-03-02 16:35:54 +01:00
|
|
|
test_concurrency(12800, 1, "small-gpu")
|
|
|
|
test_concurrency(12800, 0, "large")
|
2022-03-11 18:19:38 +00:00
|
|
|
test_concurrency(513, 0, "large")
|
|
|
|
test_concurrency(512, 0, "medium")
|
|
|
|
test_concurrency(129, 0, "medium")
|
|
|
|
test_concurrency(128, 0, "small")
|
|
|
|
test_concurrency(1, 0, "tiny")
|
|
|
|
test_concurrency(32, 0, "tiny")
|
|
|
|
test_concurrency(33, 0, "small")
|
2022-03-18 11:34:05 +00:00
|
|
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
import pytest
|
|
|
|
|
|
|
|
sys.exit(pytest.main(["-v", __file__]))
|