Fixes for --remote_shell

Author: arjunsuresh

automation/script/remote_run.py

@@ -192,14 +192,9 @@ def remote_run(self_module, i):
     if skip_ssh_key_file:
         remote_inputs['skip_ssh_key_file'] = skip_ssh_key_file
 
-    # If a remote shell is specified, wrap all commands to execute inside it
+    # If a remote shell is specified, pass it to the remote-run-commands script
     if remote_shell:
-        all_cmds = remote_pre_run_cmds + run_cmds + remote_post_run_cmds
-        combined = " ; ".join(all_cmds)
-        escaped = combined.replace('\\', '\\\\').replace('"', '\\"')
-        run_cmds = [f'{remote_shell} -c "{escaped}"']
-        remote_pre_run_cmds = []
-        remote_post_run_cmds = []
+        remote_inputs["shell"] = remote_shell
 
     # Execute the remote command
     mlc_remote_input = {

script/README.md

@@ -1,6 +1,6 @@
 # MLCommons Automation Scripts
 
-*Last updated: 2026-06-21 19:18:29*
+*Last updated: 2026-06-22 04:52:55*
 
 This directory contains automation scripts for MLPerf benchmarks, AI/ML workflows, and development operations.
 

script/remote-run-commands/customize.py

@@ -127,7 +127,12 @@ def preprocess(i):
     else:
         safe_cmd_string = shlex.quote(cmd_string)
 
-    ssh_run_command = f"{ssh_cmd_str} {user}@{host} {password_string} {safe_cmd_string}"
+    remote_shell = env.get('MLC_SSH_REMOTE_SHELL', '')
+    if remote_shell:
+        # Pipe commands to the specified shell on the remote to avoid nested quoting issues
+        ssh_run_command = f"printf '%s\\n' {safe_cmd_string} | {ssh_cmd_str} {user}@{host} {password_string} {remote_shell}"
+    else:
+        ssh_run_command = f"{ssh_cmd_str} {user}@{host} {password_string} {safe_cmd_string}"
 
     env['MLC_SSH_CMD'] = ssh_run_command
 

script/remote-run-commands/meta.yaml

@@ -49,3 +49,4 @@ input_mapping:
   skip_ssh_key_file: MLC_SKIP_SSH_KEY_FILE
   ssh_key_file: MLC_SSH_KEY_FILE
   user: MLC_SSH_USER
+  shell: MLC_SSH_REMOTE_SHELL