diff options
| -rwxr-xr-x | tools/buildbot-setup-device.sh | 14 | ||||
| -rwxr-xr-x | tools/buildbot-utils.sh | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/tools/buildbot-setup-device.sh b/tools/buildbot-setup-device.sh index 90a5010ccb..7a18d04324 100755 --- a/tools/buildbot-setup-device.sh +++ b/tools/buildbot-setup-device.sh @@ -46,13 +46,13 @@ if [[ -n "$ART_TEST_ON_VM" ]]; then mkdir -p $ART_TEST_CHROOT/usr/lib mkdir -p $ART_TEST_CHROOT/usr/share/gdb - sudo mount -t proc /proc art-test-chroot/proc - sudo mount -t sysfs /sys art-test-chroot/sys - sudo mount --bind /dev art-test-chroot/dev - sudo mount --bind /bin art-test-chroot/bin - sudo mount --bind /lib art-test-chroot/lib - sudo mount --bind /lib art-test-chroot/usr/lib - sudo mount --bind /usr/share/gdb art-test-chroot/usr/share/gdb + sudo mount -t proc /proc $ART_TEST_CHROOT_BASENAME/proc + sudo mount -t sysfs /sys $ART_TEST_CHROOT_BASENAME/sys + sudo mount --bind /dev $ART_TEST_CHROOT_BASENAME/dev + sudo mount --bind /bin $ART_TEST_CHROOT_BASENAME/bin + sudo mount --bind /lib $ART_TEST_CHROOT_BASENAME/lib + sudo mount --bind /lib $ART_TEST_CHROOT_BASENAME/usr/lib + sudo mount --bind /usr/share/gdb $ART_TEST_CHROOT_BASENAME/usr/share/gdb $ART_CHROOT_CMD echo \"Hello from chroot! I am \$(uname -a).\" " exit 0 diff --git a/tools/buildbot-utils.sh b/tools/buildbot-utils.sh index 6a0714dcd4..adbf8dd5dc 100755 --- a/tools/buildbot-utils.sh +++ b/tools/buildbot-utils.sh @@ -78,8 +78,9 @@ if [[ -n "$ART_TEST_ON_VM" ]]; then msgfatal "ART_TEST_SSH_PORT not set" fi - export ART_TEST_CHROOT="/home/$ART_TEST_SSH_USER/art-test-chroot" - export ART_CHROOT_CMD="unshare --user --map-root-user chroot art-test-chroot" + 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 -p $ART_TEST_SSH_PORT $ART_TEST_SSH_USER@$ART_TEST_SSH_HOST -o IdentityAgent=none" export ART_SCP_CMD="scp -P $ART_TEST_SSH_PORT -p -r -o IdentityAgent=none" export ART_RSYNC_CMD="rsync -az" |