diff --git a/release/ray_release/glue.py b/release/ray_release/glue.py index 5b722b8fb422..bedd105a5468 100644 --- a/release/ray_release/glue.py +++ b/release/ray_release/glue.py @@ -18,7 +18,6 @@ from ray_release.buildkite.output import buildkite_group, buildkite_open_last from ray_release.cloud_util import archive_directory from ray_release.cluster_manager.cluster_manager import ClusterManager -from ray_release.cluster_manager.full import FullClusterManager from ray_release.cluster_manager.minimal import MinimalClusterManager from ray_release.command_runner.anyscale_job_runner import AnyscaleJobRunner from ray_release.command_runner.command_runner import CommandRunner @@ -47,7 +46,6 @@ from ray_release.reporter.reporter import Reporter from ray_release.result import Result, ResultStatus, handle_exception from ray_release.signal_handling import ( - register_handler, reset_signal_handling, setup_signal_handling, ) @@ -55,7 +53,6 @@ from ray_release.test import Test type_str_to_command_runner = { - "job": AnyscaleJobRunner, "anyscale_job": AnyscaleJobRunner, } @@ -236,12 +233,6 @@ def _local_environment_information( cluster_id: Optional[str], cluster_env_id: Optional[str], ) -> None: - if isinstance(cluster_manager, FullClusterManager): - if not no_terminate: - register_handler( - lambda sig, frame: cluster_manager.terminate_cluster(wait=True) - ) - # Start cluster if cluster_id: buildkite_group(":rocket: Using existing cluster") @@ -256,10 +247,7 @@ def _local_environment_information( cluster_manager.build_configs(timeout=build_timeout) - if isinstance(cluster_manager, FullClusterManager): - buildkite_group(":rocket: Starting up cluster") - cluster_manager.start_cluster(timeout=cluster_timeout) - elif isinstance(command_runner, AnyscaleJobRunner): + if isinstance(command_runner, AnyscaleJobRunner): command_runner.job_manager.cluster_startup_timeout = cluster_timeout result.cluster_url = cluster_manager.get_cluster_url() diff --git a/release/ray_release/tests/test_glue.py b/release/ray_release/tests/test_glue.py index ba8b552febba..f6c532d11b77 100644 --- a/release/ray_release/tests/test_glue.py +++ b/release/ray_release/tests/test_glue.py @@ -14,10 +14,7 @@ from ray_release.cluster_manager.full import FullClusterManager from ray_release.command_runner.command_runner import CommandRunner from ray_release.exception import ( - ClusterCreationError, ClusterNodesWaitTimeout, - ClusterStartupError, - ClusterStartupTimeout, CommandError, CommandTimeout, ExitCode, @@ -321,40 +318,6 @@ def testInvalidClusterCompute(self): self._run(result, True) self.assertEqual(result.return_code, ExitCode.CONFIG_ERROR.value) - def testStartClusterFails(self): - result = Result() - - self._succeed_until("cluster_env") - - # Fails because API response faulty - with self.assertRaises(ClusterCreationError): - self._run(result) - self.assertEqual(result.return_code, ExitCode.CLUSTER_RESOURCE_ERROR.value) - - self.cluster_manager_return["cluster_id"] = "valid" - - # Fail for random cluster startup reason - self.cluster_manager_return["start_cluster"] = _fail_on_call( - ClusterStartupError - ) - with self.assertRaises(ClusterStartupError): - self._run(result) - self.assertEqual(result.return_code, ExitCode.CLUSTER_STARTUP_ERROR.value) - - # Ensure cluster was terminated - self.assertGreaterEqual(self.sdk.call_counter["terminate_cluster"], 1) - - # Fail for cluster startup timeout - self.cluster_manager_return["start_cluster"] = _fail_on_call( - ClusterStartupTimeout - ) - with self.assertRaises(ClusterStartupTimeout): - self._run(result) - self.assertEqual(result.return_code, ExitCode.CLUSTER_STARTUP_TIMEOUT.value) - - # Ensure cluster was terminated - self.assertGreaterEqual(self.sdk.call_counter["terminate_cluster"], 1) - def testPrepareRemoteEnvFails(self): result = Result()