diff options
| author | 2024-03-04 14:50:18 +0000 | |
|---|---|---|
| committer | 2024-03-05 12:13:27 +0000 | |
| commit | 67dd186d183d88e35d002f548f5fa443667dd014 (patch) | |
| tree | 8aaed260c269586915ce0dcf25f21ce9e90a1ad9 | |
| parent | fb90365d945e73ac5bed6249c2dbcf6e98031efd (diff) | |
Qemu: Also use ssh_config during setup&sync
Speed up ssh connections and avoid messages about changed VM keys.
Test: art/tools/buildbot-sync.sh
Change-Id: Ida942ee65e48da514797281f095f24294e437593
| -rw-r--r-- | test/testrunner/ssh_config | 1 | ||||
| -rwxr-xr-x | tools/buildbot-utils.sh | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/test/testrunner/ssh_config b/test/testrunner/ssh_config index 6d847e9e1d..459a953fbc 100644 --- a/test/testrunner/ssh_config +++ b/test/testrunner/ssh_config @@ -1,6 +1,7 @@ Host * IdentityFile ~/.ssh/ubuntu StrictHostKeyChecking no + UserKnownHostsFile /dev/null ControlMaster auto ControlPersist 10m ControlPath /run/user/%i/ssh-%C diff --git a/tools/buildbot-utils.sh b/tools/buildbot-utils.sh index 1cdd275b98..78d22431c0 100755 --- a/tools/buildbot-utils.sh +++ b/tools/buildbot-utils.sh @@ -78,13 +78,14 @@ if [[ -n "$ART_TEST_ON_VM" ]]; then msgfatal "ART_TEST_SSH_PORT not set" fi + SSH_CONFIG=$ANDROID_BUILD_TOP/art/test/testrunner/ssh_config export ART_TEST_CHROOT_BASENAME="art-test-chroot" export ART_TEST_CHROOT="/home/$ART_TEST_SSH_USER/$ART_TEST_CHROOT_BASENAME" export ART_CHROOT_CMD="unshare --user --map-root-user chroot $ART_TEST_CHROOT_BASENAME" - export ART_SSH_CMD="ssh -q -i ~/.ssh/ubuntu -p $ART_TEST_SSH_PORT -o StrictHostKeyChecking=no $ART_TEST_SSH_USER@$ART_TEST_SSH_HOST" - export ART_SCP_CMD="scp -i ~/.ssh/ubuntu -o StrictHostKeyChecking=no -P $ART_TEST_SSH_PORT -p -r" + export ART_SSH_CMD="ssh -q -F $SSH_CONFIG -p $ART_TEST_SSH_PORT $ART_TEST_SSH_USER@$ART_TEST_SSH_HOST" + export ART_SCP_CMD="scp -q -F $SSH_CONFIG -P $ART_TEST_SSH_PORT -p -r" export ART_RSYNC_CMD="rsync -az" - export RSYNC_RSH="ssh -i ~/.ssh/ubuntu -p $ART_TEST_SSH_PORT -o StrictHostKeyChecking=no" # don't prefix with "ART_", rsync expects this name + export RSYNC_RSH="ssh -q -F $SSH_CONFIG -p $ART_TEST_SSH_PORT" # don't prefix with "ART_", rsync expects this name if [[ "$TARGET_ARCH" =~ ^(arm64|riscv64)$ ]]; then export ART_TEST_VM_IMG="ubuntu-23.10-server-cloudimg-$TARGET_ARCH.img" |