reproducible: use file copies instead of links and use ftp.us.d.o for the armhf buildds

4 files changed, 56 insertions, 4 deletions

diff --git a/hosts/wbq0-armhf-rb/etc/apt/sources.list b/hosts/wbq0-armhf-rb/etc/apt/sources.list
index ef06b440..53aa863a 120000..100644
--- a/hosts/wbq0-armhf-rb/etc/apt/sources.list
+++ b/hosts/wbq0-armhf-rb/etc/apt/sources.list
@@ -1 +1,8 @@
-../../../jenkins/etc/apt/sources.list
\ No newline at end of file
+deb http://ftp.us.debian.org/debian/ jessie main non-free
+#deb-src http://ftp.us.debian.org/debian/ jessie main non-free
+
+deb http://security.debian.org/ jessie/updates main non-free
+#deb-src http://security.debian.org/ jessie/updates main non-free
+
+deb http://ftp.us.debian.org/debian/ jessie-backports main non-free
+#deb-src http://ftp.us.debian.org/debian/ jessie-backports main non-free
diff --git a/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins b/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins
index 8d84c000..d75335f9 120000..100644
--- a/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins
+++ b/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins
@@ -1 +1,44 @@
-../../../jenkins/etc/sudoers.d/jenkins
\ No newline at end of file
+jenkins ALL=  \
+	NOPASSWD: /usr/sbin/debootstrap *, \
+	/usr/bin/tee /chroots/*, \
+	/usr/bin/tee -a /chroots/*, \
+	/usr/bin/tee /etc/schroot/chroot.d/jenkins*, \
+	/bin/chmod +x /chroots/*, \
+	/usr/sbin/chroot /chroots/*, \
+	/usr/sbin/chroot /media/*, \
+	/bin/ls -la /media/*, \
+	/bin/rm -rf --one-file-system /chroots/*, \
+	/bin/rm -rf --one-file-system /schroots/*, \
+	/bin/rm -rf --one-file-system /srv/live-build/*, \
+	/bin/cp -v *.iso /srv/live-build/results/*, \
+	/bin/mv /chroots/* /schroots/*, \
+	/bin/mv /schroots/* /schroots/*, \
+	/bin/umount -l /chroots/*, \
+	/bin/umount -l /media/*, \
+	/bin/rmdir /media/*, \
+	/bin/mount -o loop*, \
+	/bin/mount --bind *, \
+	/usr/bin/du *, \
+	/bin/kill *, \
+	/usr/bin/file *, \
+	/bin/dd if=/dev/zero of=/dev/jenkins*, \
+	/usr/bin/qemu-system-x86_64 *, \
+	/usr/bin/qemu-img *, \
+	/sbin/lvcreate *, /sbin/lvremove *, \
+	/bin/mkdir -p /media/*, \
+	/usr/bin/guestmount *, \
+	/bin/cp -rv /media/*, \
+	/bin/chown -R jenkins\:jenkins /var/lib/jenkins/jobs/*,\
+	SETENV: NOPASSWD: /usr/sbin/pbuilder *, \
+	SETENV: NOPASSWD: /usr/bin/timeout -k 12.1h 12h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder *, \
+	SETENV: NOPASSWD: /usr/bin/timeout -k 12.1h 12h /usr/bin/ionice -c 3 /usr/bin/nice /usr/bin/linux64 --uname-2.6 /usr/bin/unshare --uts -- /usr/sbin/pbuilder *, \
+	/bin/mv /var/cache/pbuilder/*base*.tgz /var/cache/pbuilder/*base*.tgz, \
+	/bin/rm /var/cache/pbuilder/*base*.tgz, \
+	/bin/rm -v /var/cache/pbuilder/*base*.tgz, \
+	/bin/rm /var/cache/pbuilder/result/*, \
+	/usr/bin/dcmd rm *.changes, \
+	/usr/bin/dcmd rm *.dsc, \
+	/usr/bin/apt-get update
+
+# keep these environment variables
+Defaults        env_keep += "http_proxy", env_reset
diff --git a/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins-adm b/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins-adm
index bcd0f3f1..e585d03b 120000..100644
--- a/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins-adm
+++ b/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins-adm
@@ -1 +1,4 @@
-../../../jenkins/etc/sudoers.d/jenkins-adm
\ No newline at end of file
+# allow member of the jenkins-adm group to sudo-to the jenkins-adm user (owner
+# of jenkins script) and the jenkins user itself
+%jenkins-adm ALL=(jenkins:jenkins) NOPASSWD: ALL
+%jenkins-adm ALL=(jenkins-adm:jenkins-adm) NOPASSWD: ALL
diff --git a/hosts/wbq0-armhf-rb/wbq0 b/hosts/wbq0-armhf-rb/wbq0
deleted file mode 120000
index bb4635b1..00000000
--- a/hosts/wbq0-armhf-rb/wbq0
+++ /dev/null
@@ -1 +0,0 @@
-wbq0
\ No newline at end of file