From 521793e9bdd4d4abae1c20176f20c62974d07011 Mon Sep 17 00:00:00 2001 From: Miguel Angel Ajo Pelayo Date: Thu, 16 Oct 2025 11:56:30 +0200 Subject: [PATCH] tmt remvoe default reboot_cmd which causes issues with some tmt versions (cherry picked from commit dfd52bcefb6e894ea657aa8c26d4489b1f029e9d) --- .../jumpstarter_driver_tmt/driver.py | 2 +- .../jumpstarter_driver_tmt/driver_test.py | 8 ++++---- uv.lock | 12 +++++++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/jumpstarter-driver-tmt/jumpstarter_driver_tmt/driver.py b/packages/jumpstarter-driver-tmt/jumpstarter_driver_tmt/driver.py index bdc5f8e29..527a95e68 100644 --- a/packages/jumpstarter-driver-tmt/jumpstarter_driver_tmt/driver.py +++ b/packages/jumpstarter-driver-tmt/jumpstarter_driver_tmt/driver.py @@ -8,7 +8,7 @@ class TMT(Driver): """ driver for Jumpstarter""" - reboot_cmd: str = "j power cycle" + reboot_cmd: str = "" default_username: str = "" default_password: str = "" diff --git a/packages/jumpstarter-driver-tmt/jumpstarter_driver_tmt/driver_test.py b/packages/jumpstarter-driver-tmt/jumpstarter_driver_tmt/driver_test.py index 6cb0a8278..de4c7cba9 100644 --- a/packages/jumpstarter-driver-tmt/jumpstarter_driver_tmt/driver_test.py +++ b/packages/jumpstarter-driver-tmt/jumpstarter_driver_tmt/driver_test.py @@ -134,7 +134,7 @@ def test_drivers_tmt_run_tmt_with_forward_ssh(): result = client.run_tmt_local(True, "tmt", "user", "pass", ["arg1"]) assert result == 0 mock_run_tmt.assert_called_once_with( - "localhost", 2222, "tmt", "user", "pass", "j power cycle", ["arg1"] + "localhost", 2222, "tmt", "user", "pass", "", ["arg1"] ) @@ -148,7 +148,7 @@ def test_drivers_tmt_run_tmt_with_direct_address(): result = client.run_tmt_local(False, "tmt", "user", "pass", ["arg1"]) assert result == 0 mock_run_tmt.assert_called_once_with( - "127.0.0.1", 22, "tmt", "user", "pass", "j power cycle", ["arg1"] + "127.0.0.1", 22, "tmt", "user", "pass", "", ["arg1"] ) @@ -168,7 +168,7 @@ def test_drivers_tmt_run_tmt_fallback_to_forwarding(): result = client.run_tmt_local(False, "tmt", "user", "pass", ["arg1"]) assert result == 0 mock_run_tmt.assert_called_once_with( - "localhost", 2222, "tmt", "user", "pass", "j power cycle", ["arg1"] + "localhost", 2222, "tmt", "user", "pass", "", ["arg1"] ) @@ -236,7 +236,7 @@ def test_drivers_tmt_driver_defaults(): with serve(instance) as client: # Test default reboot_cmd reboot_cmd = client.call("get_reboot_cmd") - assert reboot_cmd == "j power cycle" + assert reboot_cmd == "" # Test default username and password username, password = client.call("get_default_user_pass") diff --git a/uv.lock b/uv.lock index 34e74332e..d20831c7d 100644 --- a/uv.lock +++ b/uv.lock @@ -1078,6 +1078,7 @@ dependencies = [ { name = "jumpstarter-driver-sdwire" }, { name = "jumpstarter-driver-shell" }, { name = "jumpstarter-driver-snmp" }, + { name = "jumpstarter-driver-ssh" }, { name = "jumpstarter-driver-tftp" }, { name = "jumpstarter-driver-tmt" }, { name = "jumpstarter-driver-uboot" }, @@ -1113,6 +1114,7 @@ requires-dist = [ { name = "jumpstarter-driver-sdwire", editable = "packages/jumpstarter-driver-sdwire" }, { name = "jumpstarter-driver-shell", editable = "packages/jumpstarter-driver-shell" }, { name = "jumpstarter-driver-snmp", editable = "packages/jumpstarter-driver-snmp" }, + { name = "jumpstarter-driver-ssh", editable = "packages/jumpstarter-driver-ssh" }, { name = "jumpstarter-driver-tftp", editable = "packages/jumpstarter-driver-tftp" }, { name = "jumpstarter-driver-tmt", editable = "packages/jumpstarter-driver-tmt" }, { name = "jumpstarter-driver-uboot", editable = "packages/jumpstarter-driver-uboot" }, @@ -1566,9 +1568,11 @@ name = "jumpstarter-driver-iscsi" source = { editable = "packages/jumpstarter-driver-iscsi" } dependencies = [ { name = "anyio" }, + { name = "click" }, { name = "jumpstarter" }, { name = "jumpstarter-driver-composite" }, { name = "jumpstarter-driver-opendal" }, + { name = "requests" }, { name = "rtslib-fb" }, ] @@ -1582,9 +1586,11 @@ dev = [ [package.metadata] requires-dist = [ { name = "anyio", specifier = ">=4.10.0" }, + { name = "click", specifier = ">=8.1.8" }, { name = "jumpstarter", editable = "packages/jumpstarter" }, { name = "jumpstarter-driver-composite", editable = "packages/jumpstarter-driver-composite" }, { name = "jumpstarter-driver-opendal", editable = "packages/jumpstarter-driver-opendal" }, + { name = "requests", specifier = ">=2.32.5" }, { name = "rtslib-fb" }, ] @@ -3397,7 +3403,7 @@ wheels = [ [[package]] name = "requests" -version = "2.32.4" +version = "2.32.5" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "certifi" }, @@ -3405,9 +3411,9 @@ dependencies = [ { name = "idna" }, { name = "urllib3" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/e1/0a/929373653770d8a0d7ea76c37de6e41f11eb07559b103b1c02cafb3f7cf8/requests-2.32.4.tar.gz", hash = "sha256:27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422", size = 135258, upload-time = "2025-06-09T16:43:07.34Z" } +sdist = { url = "https://files.pythonhosted.org/packages/c9/74/b3ff8e6c8446842c3f5c837e9c3dfcfe2018ea6ecef224c710c85ef728f4/requests-2.32.5.tar.gz", hash = "sha256:dbba0bac56e100853db0ea71b82b4dfd5fe2bf6d3754a8893c3af500cec7d7cf", size = 134517, upload-time = "2025-08-18T20:46:02.573Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/7c/e4/56027c4a6b4ae70ca9de302488c5ca95ad4a39e190093d6c1a8ace08341b/requests-2.32.4-py3-none-any.whl", hash = "sha256:27babd3cda2a6d50b30443204ee89830707d396671944c998b5975b031ac2b2c", size = 64847, upload-time = "2025-06-09T16:43:05.728Z" }, + { url = "https://files.pythonhosted.org/packages/1e/db/4254e3eabe8020b458f1a747140d32277ec7a271daf1d235b70dc0b4e6e3/requests-2.32.5-py3-none-any.whl", hash = "sha256:2462f94637a34fd532264295e186976db0f5d453d1cdd31473c85a6a161affb6", size = 64738, upload-time = "2025-08-18T20:46:00.542Z" }, ] [[package]]