Skip to content

Commit 62a42c6

Browse files
authored
Rely UCX on the latest 14.3 LTS DBR instead of 15.x (#1097)
Fixes #1096 This is a quickfix. The long-term solution is tracked in #1098
1 parent bfc1a61 commit 62a42c6

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/databricks/labs/ucx/installer/policy.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ def _get_instance_pool_id(self) -> str | None:
8888
return None
8989

9090
def _definition(self, conf: dict, instance_profile: str | None, instance_pool_id: str | None) -> str:
91+
latest_lts_dbr = self._ws.clusters.select_spark_version(latest=True, long_term_support=True)
9192
policy_definition = {
92-
"spark_version": self._policy_config(self._ws.clusters.select_spark_version(latest=True)),
93+
"spark_version": self._policy_config(latest_lts_dbr),
9394
"node_type_id": self._policy_config(self._ws.clusters.select_node_type(local_disk=True)),
9495
}
9596
if instance_pool_id:

tests/unit/installer/test_policy.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def common():
2727
w.cluster_policies.create.return_value = policy
2828

2929
w.cluster_policies.list.return_value = [policy]
30-
w.clusters.select_spark_version = lambda latest: "14.2.x-scala2.12"
30+
w.clusters.select_spark_version = lambda **_: "14.2.x-scala2.12"
3131
w.clusters.select_node_type = lambda local_disk: "Standard_F4s"
3232
w.current_user.me = lambda: iam.User(user_name="[email protected]", groups=[iam.ComplexValue(display="admins")])
3333
prompts = MockPrompts(

tests/unit/test_install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def download(path: str) -> io.StringIO | io.BytesIO:
130130
workspace_client.dashboard_widgets.create.return_value = Widget(id="abc")
131131
workspace_client.clusters.list.return_value = mock_clusters()
132132
workspace_client.cluster_policies.create.return_value = CreatePolicyResponse(policy_id="foo")
133-
workspace_client.clusters.select_spark_version = lambda latest: "14.2.x-scala2.12"
133+
workspace_client.clusters.select_spark_version = lambda **_: "14.2.x-scala2.12"
134134
workspace_client.clusters.select_node_type = lambda local_disk: "Standard_F4s"
135135
workspace_client.workspace.download = download
136136

0 commit comments

Comments
 (0)