diff options
author | Dennis Song <denniscy@google.com> | 2023-12-14 07:05:30 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-14 07:05:30 +0000 |
commit | 584da616165b42cf61de845eeea2951b379b0c6b (patch) | |
tree | a97bb99961b1d66def1b2e2fd64208443beb2cdb | |
parent | 39c004d41e553b298dcf44b5887956e6d64b67ba (diff) | |
parent | 294a79132e404f5b0c57908b58c67eed30a7dbb1 (diff) | |
download | cuttlefish-584da616165b42cf61de845eeea2951b379b0c6b.tar.gz |
Merge "Print the launcher.log while establishing the ssh tunnel" into main am: 551811ad31 am: e050389ccb am: 294a79132e
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/2854383
Change-Id: I49675f6d1c76b68f4b9281c6cb7b61c46968412b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-x | tools/launch_cvd_arm64_server.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/launch_cvd_arm64_server.sh b/tools/launch_cvd_arm64_server.sh index 6c429bb3b..60c7a4966 100755 --- a/tools/launch_cvd_arm64_server.sh +++ b/tools/launch_cvd_arm64_server.sh @@ -87,10 +87,13 @@ echo -e "Web UI port: $web_ui_port. ${color_cyan}Please point your browser to ht # sets up SSH port forwarding to the remote server for various ports and launch cvd instance adb_port_forwarding="" +print_launcher_logs="" for instance_num in $(seq $base_instance_num $(($base_instance_num+$num_instances-1))); do + device_name="cvd_$base_instance_num-$instance_num" adb_port=$((6520+$instance_num-1)) - echo -e "Device-$instance_num is using adb port $adb_port. Try ${color_cyan}adb connect 127.0.0.1:${adb_port}${color_plain} if you want to connect to this device" + echo -e "$device_name is using adb port $adb_port. Try ${color_cyan}adb connect 127.0.0.1:${adb_port}${color_plain} if you want to connect to this device" adb_port_forwarding+="-L $adb_port:127.0.0.1:$adb_port " + print_launcher_logs+="tail -f ~/$cvd_home_dir/cuttlefish/instances/cvd-$instance_num/logs/launcher.log | sed 's/^/[$device_name] /' &" done ports_forwarding="-L $web_ui_port:127.0.0.1:1443 \ @@ -100,4 +103,4 @@ ports_forwarding="-L $web_ui_port:127.0.0.1:1443 \ $adb_port_forwarding" echo "Set up ssh ports forwarding: $ports_forwarding" echo -e "${color_yellow}Please stop the running instances by ctrl+c${color_plain}" -ssh -N $server $ports_forwarding +ssh $server $ports_forwarding $print_launcher_logs |