Skip to content
Commits on Source (2)
......@@ -18,7 +18,7 @@ Debian packages for t.r-b.o
** 9 cores and 36 GB memory for profitbricks-build16-i386.debian.net sed for building i386 Debian packages for t.r-b.o, running in the future
** 2 cores and 8 GB memory for profitbricks-build7-amd64.debian.net used for building F-Droid for t.r-b.o
** 5 cores and 10 GB memory for profitbricks-build9-amd64.debian.net used for rebootstrap jobs
** 4 cores and 12 GB memory for profitbricks-build10-amd64.debian.net used for lvc jobs
** 4 cores and 12 GB memory for profitbricks-build10-amd64.debian.net used for chroot-installation jobs
** 9 cores and 19 GB memory for freebsd-jenkins.debian.net (also running on Profitbricks virtual hardware), used for building FreeBSD for t.r-b.o
* link:https://qa.debian.org/developer.php?login=vagrant%40debian.org[Vagrant] provides and hosts 27 'armhf' systems, used for building armhf Debian packages for t.r-b.o:
** four quad-cores with 4 GB RAM each,
......
cleanup /srv/lvc on pb10
cleanup that code in update_jdn.sh
cleanup LVC in bin/d-i_build.sh
cleanup THANKS.head for pb10
cleanup job-cfg/d-i.yaml.py (search for lvc)
......@@ -110,7 +110,6 @@ user_host_groups['holger','jenkins']="reproducible,${user_host_groups['holger','
user_host_groups['mattia','*']="$sudo_groups"
user_host_groups['mattia','jenkins']="reproducible,${user_host_groups['mattia','*']}"
user_host_groups['phil','jenkins-test-vm']="$sudo_groups,libvirt,libvirt-qemu"
user_host_groups['phil','profitbricks-build10-amd64']="$sudo_groups"
user_host_groups['phil','jenkins']="$sudo_groups"
user_host_groups['lunar','jenkins']='reproducible'
user_host_groups['lynxis','profitbricks-build3-amd64']="$sudo_groups"
......@@ -157,25 +156,11 @@ sudo mkdir -p /srv/workspace
[ -h /chroots ] || sudo ln -s /srv/workspace/chroots /chroots
[ -h /schroots ] || sudo ln -s /srv/schroots /schroots
if [ "$HOSTNAME" = "jenkins-test-vm" ] || [ "$HOSTNAME" = "profitbricks-build10-amd64" ] || [ "$HOSTNAME" = "profitbricks-build7-amd64" ] ; then
if [ "$HOSTNAME" = "jenkins-test-vm" ] || [ "$HOSTNAME" = "profitbricks-build7-amd64" ] ; then
# jenkins needs access to libvirt
sudo adduser jenkins kvm
sudo adduser jenkins libvirt
sudo adduser jenkins libvirt-qemu
# we need a directory for the VM's storage pools
VM_POOL_DIR=/srv/lvc/vm-pools
if [ ! -d $VM_POOL_DIR ] ; then
sudo mkdir -p $VM_POOL_DIR
sudo chown jenkins:libvirt-qemu $VM_POOL_DIR
sudo chmod 775 $VM_POOL_DIR
fi
# tidy up after ourselves, for a while at least
OLD_VM_POOL_DIR=/srv/workspace/vm-pools
if [ -d "$OLD_VM_POOL_DIR" ] ; then
sudo rm -r "$OLD_VM_POOL_DIR"
fi
fi
# prepare tmpfs on some hosts
......@@ -222,22 +207,6 @@ case $HOSTNAME in
;;
*) ;;
esac
case $HOSTNAME in
profitbricks-build10-amd64)
[ -d /srv/lvc/vm-pools ] || sudo mkdir -p /srv/lvc/vm-pools
if ! grep -q '^/dev/vdb\s\+/srv/lvc/vm-pools\s' /etc/fstab; then
echo "/dev/vdb /srv/lvc/vm-pools ext4 errors=remount-ro 0 2" | sudo tee -a /etc/fstab >/dev/null
fi
if ! mountpoint -q /srv/lvc/vm-pools; then
if test -z "$(ls -A /srv/lvc/vm-pools)"; then
sudo mount /srv/lvc/vm-pools
else
explain "WARNING: mountpoint /srv/lvc/vm-pools is non-empty."
fi
fi
;;
*) ;;
esac
# make sure needed directories exists - some directories will not be needed on all hosts...
for directory in /schroots /srv/reproducible-results /srv/d-i /srv/udebs /srv/live-build /var/log/jenkins/ /srv/jenkins /srv/jenkins/pseudo-hosts /srv/workspace/chroots ; do
......