diff options
| author | Dennis Song <denniscy@google.com> | 2023-12-14 06:03:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-14 06:03:22 +0000 |
| commit | e050389ccbc9c38af8e4b6a1ab05eea8d7f2d3b8 (patch) | |
| tree | e980a68ba438c3182ec3d30bae77e38877747e8d | |
| parent | 5ff70668991f87fae5b065021c7ca325293bf1ca (diff) | |
| parent | 551811ad31509481a44186f059ff99feb797f94d (diff) | |
| download | cuttlefish-e050389ccbc9c38af8e4b6a1ab05eea8d7f2d3b8.tar.gz | |
Merge "Print the launcher.log while establishing the ssh tunnel" into main am: 551811ad31
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/2854383
Change-Id: I916899f736e5b4da46eb9cbce0119a4133b0f45d
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 |