Skip to content

Commit f0afa5e

Browse files
hmeirclaude
andcommitted
Support multi-arch cpu_arch in py_config and schedulable_nodes
Store cpu_arch as list in py_config for multi-arch runs. Fix schedulable_nodes to normalize cpu_arch to list and use 'in' membership check. Update cluster info log to handle list cpu_arch display. Signed-off-by: Harel Meir <hmeir@redhat.com> Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
1 parent 6598193 commit f0afa5e

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

utilities/pytest_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -598,6 +598,7 @@ def update_cpu_arch_related_config(cpu_arch_option: str) -> None:
598598
cpu_arch = cpu_arch_option.split(",") if cpu_arch_option else list(get_cluster_architecture())
599599

600600
if len(cpu_arch) > 1:
601+
py_config["cpu_arch"] = cpu_arch # stored as list for multiarch runs
601602
LOGGER.warning("OS matrix generation is not supported for multi-arch runs!")
602603
else:
603604
arch = cpu_arch[0]

utilities/unittests/test_pytest_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,7 +1890,7 @@ def test_multi_arch_option_logs_warning(
18901890
mock_logger.warning.assert_called_once_with("OS matrix generation is not supported for multi-arch runs!")
18911891
mock_generate_common.assert_not_called()
18921892
mock_generate_instance.assert_not_called()
1893-
assert "cpu_arch" not in mock_py_config
1893+
assert mock_py_config["cpu_arch"] == ["amd64", "arm64"]
18941894

18951895
@patch("utilities.pytest_utils.generate_instance_type_matrix_dicts")
18961896
@patch("utilities.pytest_utils.generate_common_template_matrix_dicts")
@@ -2115,7 +2115,7 @@ def test_three_arch_option_logs_warning(
21152115
mock_logger.warning.assert_called_once_with("OS matrix generation is not supported for multi-arch runs!")
21162116
mock_generate_common.assert_not_called()
21172117
mock_generate_instance.assert_not_called()
2118-
assert "cpu_arch" not in mock_py_config
2118+
assert mock_py_config["cpu_arch"] == ["amd64", "arm64", "s390x"]
21192119

21202120
@patch("utilities.pytest_utils.generate_instance_type_matrix_dicts")
21212121
@patch("utilities.pytest_utils.generate_common_template_matrix_dicts")

0 commit comments

Comments
 (0)