Author: Matti Picus <[email protected]>
Branch:
Changeset: r1096:e2b202b96f3e
Date: 2019-10-15 15:39 +0300
http://bitbucket.org/pypy/buildbot/changeset/e2b202b96f3e/
Log: update linux64 chroot description, try to fix aarch64 view in
nightlies
diff --git a/README-CHROOT b/README-CHROOT
--- a/README-CHROOT
+++ b/README-CHROOT
@@ -2,53 +2,62 @@
---------------------------------------------------------
Buildslave runs in a chroot:
- LANG=C chroot /mnt/ubuntu /bin/bash
+ LANG=C chroot /extra1/xenial64 /bin/bash
su - buildslave
-
+ buildslave start /home/buildslave/build_dir
Commands to run once after a reboot to set the chroot:
>>> have been copied into /etc/rc.local
-mount --rbind /tmp /home/tmp
-mount --rbind /extra1 /home/extra1
-mount --rbind /proc /mnt/ubuntu/proc
-mount --rbind /sys /mnt/ubuntu/sys
-mount --rbind /dev /mnt/ubuntu/dev
-mount --rbind /run/lock /mnt/ubuntu/run/lock
-mount --rbind /run/shm /mnt/ubuntu/run/shm
-
+# from the older 14.04 chroot on /mnt/ubuntu
+#mount --rbind /tmp /home/tmp
+#mount --rbind /extra1 /home/extra1
+#mount --rbind /proc /mnt/ubuntu/proc
+#mount --rbind /sys /mnt/ubuntu/sys
+#mount --rbind /dev /mnt/ubuntu/dev
+#mount --rbind /run/lock /mnt/ubuntu/run/lock
+#mount --rbind /run/shm /mnt/ubuntu/run/shm
+# now use /extra1/xenial64
+mount --bind /tmp /extra1/xenial64/tmp
+mount --rbind /proc /extra1/xenial64/proc
+mount --rbind /sys /extra1/xenial64/sys
+mount --rbind /dev /extra1/xenial64/dev
+mount --rbind /run/lock /extra1/xenial64/run/lock
+mount --rbind /run/shm /extra1/xenial64/run/shm
---------------------------------------------------------
And here is the same for the 32-bit chroot
---------------------------------------------------------
-32 bit buildslave runs in a debian strech chroot,
-chosen since debian comes with gcc6:
+32 bit buildslave runs in a ubuntu xenial chroot on benchmarker:
- LANG=C chroot /extra1/stretch32 /bin/bash
+ LANG=C chroot /opt/xenial32 /bin/bash
su - buildslave
Commands to run once after a reboot to set the chroot:
>>> have been copied into /etc/rc.local
-mount --rbind /tmp /extra1/stretch32/tmp
-mount --rbind /proc /extra1/stretch32/proc
-mount --rbind /sys /extra1/stretch32/sys
-mount --rbind /dev /extra1/stretch32/dev
-mount --rbind /run/lock /extra1/stretch32/run/lock
+mount --rbind /tmp /opt/xenial32/tmp
+mount --rbind /proc /opt/xenial32/proc
+mount --rbind /sys /opt/xenial32/sys
+mount --rbind /dev /opt/xenial32/dev
+mount --rbind /run/lock /opt/xenial32/run/lock
Commands to build the chroot
-mkdir /extra1/stretch32
+mkdir /opt/xenial32
sudo debootstrap --variant=buildd --arch=i386 stretch \
- /extra1/stretch32 http://deb.debian.org/debian
-LANG=C chroot /extra1/stretch32
-echo stretch32 > /etc/debian_chroot
+ /opt/xenial32 http://archive.ubuntu.com/ubuntu/
+# or use arch=amd64
+LANG=C chroot /opt/xenial32
+echo xenial32 > /etc/debian_chroot
adduser buildslave
# go back out out of the chroot and set buildslave's UID to the UID on the host
-chmod buildslave.buildslave -R /extra1/stretch32/home/buildslave
+# by editing /opt/xenial32/passwd, /opt/xenial32/group
+chown buildslave.buildslave -R /opt/xenial32/home/buildslave
+# now inside the chroot
apt install virtualenv buildbot-slave python-pytest python-hypothesis \
netbase gdb ncurses-term pypy locales mercurial
diff --git a/bot2/pypybuildbot/pypylist.py b/bot2/pypybuildbot/pypylist.py
--- a/bot2/pypybuildbot/pypylist.py
+++ b/bot2/pypybuildbot/pypylist.py
@@ -39,7 +39,7 @@
PLATFORMS = {
'linux': 'linux-x86-32',
'linux64': 'linux-x86-64',
- 'aarch64': 'aarch64',
+ 'aarch64': 'linux-aarch64',
'osx': 'macosx-x86-32',
'osx64': 'macosx-x86-64',
'win32': 'win-x86-32',
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
