Merge branch 'main' into multi_selector

Author: mangelajo

packages/jumpstarter-driver-ridesx/jumpstarter_driver_ridesx/client.py

@@ -121,14 +121,19 @@ def cli(self):
         generic_cli = FlasherClient.cli(self)
 
         @driver_click_group(self)
-        def storage():
+        def base():
             """RideSX storage operations"""
             pass
 
         for name, cmd in generic_cli.commands.items():
-            storage.add_command(cmd, name=name)
+            base.add_command(cmd, name=name)
 
-        return storage
+        @base.command()
+        def boot_to_fastboot():
+            """Boot to fastboot"""
+            self.boot_to_fastboot()
+
+        return base
 
 
 @dataclass(kw_only=True)

packages/jumpstarter-driver-ridesx/jumpstarter_driver_ridesx/driver.py

@@ -14,7 +14,9 @@
 @dataclass(kw_only=True)
 class RideSXDriver(Driver):
     """RideSX Driver"""
-
+    decompression_timeout: int = field(default=15 * 60) # 15 minutes
+    flash_timeout: int = field(default=30 * 60) # 30 minutes
+    continue_timeout: int = field(default=20 * 60) # 20 minutes
     storage_dir: str = field(default="/var/lib/jumpstarter/ridesx")
 
     def __post_init__(self):
@@ -74,7 +76,7 @@ def _decompress_file(self, compressed_file: Path) -> Path:
                     stderr=subprocess.PIPE,
                     text=False,
                     check=True,
-                    timeout=600,
+                    timeout=self.decompression_timeout,
                 )
 
             if result.stderr:
@@ -168,7 +170,7 @@ def flash_with_fastboot(self, device_id: str, partitions: Dict[str, str]):
             self.logger.debug(f"Running command: {' '.join(cmd)}")
 
             try:
-                result = subprocess.run(cmd, capture_output=True, text=True, check=True, timeout=800)
+                result = subprocess.run(cmd, capture_output=True, text=True, check=True, timeout=self.flash_timeout)
                 self.logger.info(f"Successfully flashed {partition_name}")
                 self.logger.debug(f"Flash stdout: {result.stdout}")
                 if result.stderr:
@@ -186,7 +188,7 @@ def flash_with_fastboot(self, device_id: str, partitions: Dict[str, str]):
         cmd = ["fastboot", "-s", device_id, "continue"]
         self.logger.debug(f"Running command: {' '.join(cmd)}")
         try:
-            result = subprocess.run(cmd, capture_output=True, text=True, check=True, timeout=300)
+            result = subprocess.run(cmd, capture_output=True, text=True, check=True, timeout=self.continue_timeout)
             self.logger.debug(f"Fastboot continue stdout: {result.stdout}")
             self.logger.debug(f"Fastboot continue stderr: {result.stderr}")
             self.logger.info("Fastboot continue completed successfully")