commit b45b07a39759018443d11a3c3f9283dd4dac5584
author Jaeheon Yi <jaeheon@google.com> Tue Jun 06 10:59:19 2023 -0700
committer Jaeheon Yi <jaeheon@google.com> Tue Jul 18 21:33:17 2023 -0700
tree 204b6391af1d924816ffec59083ecf204cd18fc3
parent 5850343e244278a9bdf953a8a23407695e53781b

art: easier chroot name changes

Test: modify ART_TEST_CHROOT_BASENAME in buildbot-utils.sh, run a test

Change-Id: I20aceefa9e773c91847a7552a85485f3d41b59d4

tools/buildbot-setup-device.sh

diff --git a/tools/buildbot-setup-device.sh b/tools/buildbot-setup-device.sh
index 90a5010..7a18d04 100755
--- a/tools/buildbot-setup-device.sh
+++ b/tools/buildbot-setup-device.sh
@@ -46,13 +46,13 @@
     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

tools/buildbot-utils.sh

diff --git a/tools/buildbot-utils.sh b/tools/buildbot-utils.sh
index 6a0714d..adbf8dd 100755
--- a/tools/buildbot-utils.sh
+++ b/tools/buildbot-utils.sh
@@ -78,8 +78,9 @@
     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"