Commit 2ddfd5b9 authored by Holger Levsen's avatar Holger Levsen

reproducible OpenWrt/coreboot/NetBSD: move to osuosl 171 & 172, from pb3 & pb4

Signed-off-by: Holger Levsen's avatarHolger Levsen <holger@layer-acht.org>
parent 7d4e095a
......@@ -7,8 +7,6 @@
** 15 cores and 48 GB memory for profitbricks-build1-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o)
** 10 cores and 36 GB memory for profitbricks-build2-i386.debian.net used for building i386
Debian packages for t.r-b.o
** 12 cores and 24 GB memory for profitbricks-build3-amd64.debian.net used for building OpenWrt, coreboot, Fedora and NetBSD for t.r-b.o
** 11 cores and 24 GB memory for profitbricks-build4-amd64.debian.net used for building OpenWrt, coreboot, Fedora and NetBSD for t.r-b.o, running in the future
** 16 cores and 48 GB memory for profitbricks-build5-amd64.debian.net used for building amd64 Debian packages for t.r-b.o, running in the future
** 9 cores and 36 GB memory for profitbricks-build6-i386.debian.net used for building i386 Debian packages for t.r-b.o, running in the future
** 15 cores and 48 GB memory for profitbricks-build11-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o)
......@@ -42,8 +40,8 @@ Debian packages for t.r-b.o
** 32 cores with 144 GB memory for osuosl168-amd64.debian.net used for building F-Droid for t.r-b.o
** 32 cores with 144 GB memory for osuosl169-amd64.debian.net used for building Arch Linux for t.r-b.o
** 32 cores with 144 GB memory for osuosl170-amd64.debian.net used for building Arch Linux for t.r-b.o
** 32 cores with 144 GB memory for osuosl171-amd64.debian.net
** 32 cores with 144 GB memory for osuosl172-amd64.debian.net
** 32 cores with 144 GB memory for osuosl171-amd64.debian.net used for building OpenWrt, coreboot, Fedora and NetBSD for t.r-b.o
** 32 cores with 144 GB memory for osuosl172-amd64.debian.net used for building OpenWrt, coreboot, Fedora and NetBSD for t.r-b.o
** 32 cores with 144 GB memory for osuosl173-amd64.debian.net
** 32 cores with 144 GB memory for osuosl174-amd64.debian.net
......
......@@ -70,8 +70,10 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
*** inform #osuosl
** done: osuosl169: archlinux
** done: osuosl170: archlinux (future)
** osuosl171: openwrt, coreboot, netbsd, opensuse
** osuosl172: openwrt, coreboot, netbsd, opensuse (future)
** osuosl171: openwrt, coreboot, netbsd, FIXME: opensuse/redhat
*** was pb3
** osuosl172: openwrt, coreboot, netbsd, FIXME: opensuse/redhat (future)
*** was pb4
** osuosl173: debian
** osuosl174: debian (future)
* add to README
......@@ -206,8 +208,8 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
==== reproducible non-Debian tests, new host for 398 day variation is unused
* locations in the code which need to be changed
** RPM_BUILD_NODE=profitbricks-build3-amd64
** grep for profitbricks-build3-amd64, there's more
** RPM_BUILD_NODE=osuosl-build171-amd64
** grep for osuosl-build171-amd64, there's more
* IOW: these tests should use it:
** coreboot
** netbsd
......@@ -300,7 +302,7 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
* setup script:
** mock --clean just uninstalls the chroot but it'll still be rebuilt next time using cache. you can delete the caches from /var/cache/mock/ or touch the mock config
** is /etc/yum/repos.d/fedora.repo really needed?
** hosts/pb-build3/etc/yum/repos.d/* is really not sooo good but works…
** hosts/osuosl-build171/etc/yum/repos.d/* is really not sooo good but works…
* build script
** cleanup mock cache between two builds: --scrub=all might be too much, but whats sensible (or is it --scrub=all?)?
** no variations introduced yet:
......@@ -393,9 +395,7 @@ $ du -hd1 | sort -h | tail -n 6
==== reproducible qubes
* dont forget: rm holger@profitbricks-build3-amd64:qubes-test/
* dont forget: rm userContent/qubes/q(1|2) on jenkins
* add qubes test on pb3 / t.r-b.o
* add qubes test on t.r-b.o
----
git clone https://github.com/qubesos/qubes-builder
make get-sources BUILDERCONF=scripts/travis-builder.conf COMPONENTS=installer-qubes-os
......@@ -405,7 +405,7 @@ $ du -hd1 | sort -h | tail -n 6
make qubes iso BUILDERCONF=scripts/travis-builder.conf VERBOSE=0 COMPONENTS=installer-qubes-os
----
* pb3 has been modified manually: apt install createrepo python-yaml
* depends: apt install createrepo python-yaml
* once this iso is being tested, it will be interesting to build the Qubes templates as well, as those images (Qubes templates are images) will be copied on the installation iso. the above iso is a stripped down iso without templates… (and not the real thing)
==== reproducible guix
......
......@@ -141,10 +141,10 @@ else
fi
# force http_proxy as we want it
case $HOSTNAME in
jenkins|jenkins-test-vm|profitbricks-build1-a*|profitbricks-build2*|profitbricks-build3*|profitbricks-build9*|profitbricks-build11*|profitbricks-build12*)
jenkins|jenkins-test-vm|profitbricks-build1-a*|profitbricks-build2*|profitbricks-build9*|profitbricks-build11*|profitbricks-build12*)
# pb datacenter in karlsruhe uses pb1 as proxy:
export http_proxy="http://78.137.99.97:3128" ;;
profitbricks-build4*|profitbricks-build5*|profitbricks-build6*|profitbricks-build10*|profitbricks-build15*|profitbricks-build16*)
profitbricks-build5*|profitbricks-build6*|profitbricks-build10*|profitbricks-build15*|profitbricks-build16*)
# pb datacenter in frankfurt uses pb10 as proxy:
export http_proxy="http://85.184.249.68:3128" ;;
osuosl*)
......
#!/bin/bash
# Copyright 2015-2018 Holger Levsen <holger@layer-acht.org>
# Copyright 2015-2019 Holger Levsen <holger@layer-acht.org>
# released under the GPLv=2
# define Debian build nodes in use for tests.reproducible-builds.org/debian/
......@@ -9,7 +9,7 @@
# where it *must* only contain the Debian nodes as it's used
# to generate the variations… and
# - bin/reproducible_cleanup_nodes.sh where it would be
# nice to also include pb-build3+4+7+9+10, to also cleanup
# nice to also include pb-build9+10, to also cleanup
# jobs there…
BUILD_NODES="bbx15-armhf-rb.debian.net
cb3a-armhf-rb.debian.net
......@@ -137,7 +137,7 @@ get_node_ssh_port() {
p64c*)
PORT=2248
;;
profitbricks-build[456]*|profitbricks-build1[56]*)
profitbricks-build[56]*|profitbricks-build1[56]*)
NODE_RUN_IN_THE_FUTURE=true
PORT=22
;;
......@@ -189,6 +189,7 @@ get_node_ssh_port() {
PORT=45050
;;
osuosl-build172*)
NODE_RUN_IN_THE_FUTURE=true
PORT=45051
;;
osuosl-build173*)
......
......@@ -392,7 +392,7 @@ mkdir b1 b2
N1="osuosl-build169-amd64"
N2="osuosl-build170-amd64"
# if random number between 0 and 99 is greater than 60…
# (because pb4 is generally less loaded than pb3)
# (because osuosl169 is generally less loaded than osuosl170)
if [ $(( ( $RANDOM % 100 ) )) -gt 60 ] ; then
NODE1=$N1
NODE2=$N2
......
......@@ -61,7 +61,7 @@ ARCHLINUX_PKGS=/srv/reproducible-results/archlinux_pkgs
ARCHBASE=$BASE/archlinux
# common settings for testing rpm based distros
RPM_BUILD_NODE=profitbricks-build3-amd64
RPM_BUILD_NODE=osuosl-build171-amd64
RPM_PKGS=/srv/reproducible-results/rpm_pkgs
# number of cores to be used
......@@ -434,7 +434,7 @@ write_variation_table() {
write_page "<tr><td>domainname</td><td>$(hostname -d)</td><td>i-capture-the-domainname</td></tr>"
else
if [ "$1" != "Arch Linux" ] || [ "$1" != "OpenWrt" ] ; then
write_page "<tr><td>hostname</td><td> profitbricks-build3-amd64 or profitbricks-build4-amd64</td><td>the other one</td></tr>"
write_page "<tr><td>hostname</td><td> osuosl-build171-amd64 or osuosl-build172-amd64</td><td>the other one</td></tr>"
else
write_page "<tr><td>hostname</td><td colspan=\"2\"> is not yet varied between rebuilds of $1.</td></tr>"
fi
......@@ -535,7 +535,7 @@ write_variation_table() {
elif [ "$1" = "Arch Linux" ] ; then
write_page "<tr><td>year, month, date</td><td>osuosl-build169-amd64: today ($DATE) or osuosl-build170-amd64: 398 days in the future ($FUTURE)</td><td>the other one</td></tr>"
else
write_page "<tr><td>year, month, date</td><td>profitbricks-build3-amd64: today ($DATE) or profitbricks-build4-amd64: 398 days in the future ($FUTURE)</td><td>the other one</td></tr>"
write_page "<tr><td>year, month, date</td><td>osuosl-build171-amd64: today ($DATE) or osuosl-build172-amd64: 398 days in the future ($FUTURE)</td><td>the other one</td></tr>"
fi
fi
if [ "$1" != "FreeBSD" ] ; then
......
......@@ -17,14 +17,14 @@ common_init "$@"
explain_nodes() {
case $JENKINS_NODENAME in
jenkins) ;;
profitbricks3) write_page "<br /><small>(r-b OpenWrt, NetBSD, Coreboot builds)</small>" ;;
profitbricks4) write_page "<br /><small>(r-b OpenWrt, NetBSD, Coreboot builds)</small>" ;;
profitbricks9) write_page "<br /><small>(jenkins.d.n rebootstrap jobs)</small>" ;;
profitbricks10) write_page "<br /><small>(jenkins.d.n chroot-installation jobs)</small>" ;;
osuosl167) write_page "<br /><small>(http-proxy for osuosl nodes)</small>" ;;
osuosl168) write_page "<br /><small>(r-b F-Droid builds)</small>" ;;
osuosl169) write_page "<br /><small>(r-b Archlinux builds)</small>" ;;
osuosl170) write_page "<br /><small>(r-b Archlinux builds)</small>" ;;
osuosl171) write_page "<br /><small>(r-b OpenWrt, NetBSD, Coreboot builds)</small>" ;;
osuosl172) write_page "<br /><small>(r-b OpenWrt, NetBSD, Coreboot builds)</small>" ;;
osuosl*) write_page "<br /><small>(TBD - setup in progress)</small>" ;;
*) write_page "<br /><small>(r-b Debian builds)</small>" ;;
esac
......@@ -62,11 +62,7 @@ build_nodes_health_page() {
for NODE in $BUILD_NODES ; do
REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES $NODE"
if [ "$NODE" = "profitbricks-build2-i386.debian.net" ] ; then
# pb3 r-b archlinux
# pb4 r-b archlinux
REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net"
elif [ "$NODE" = "profitbricks-build6-i386.debian.net" ] ; then
if [ "$NODE" = "profitbricks-build6-i386.debian.net" ] ; then
# pb9 rebootstrap jobs
# pb10 chroot jobs
REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net"
......@@ -113,8 +109,6 @@ build_nodes_health_page() {
# worker.log links
case $JENKINS_NODENAME in
jenkins) write_page "<td></td>" ;;
profitbricks3) write_page "<td></td>" ;;
profitbricks4) write_page "<td></td>" ;;
profitbricks9) write_page "<td></td>" ;;
profitbricks10) write_page "<td></td>" ;;
osuosl*) write_page "<td></td>" ;;
......@@ -131,8 +125,6 @@ build_nodes_health_page() {
for SUITE in ${SUITES} ; do
case $JENKINS_NODENAME in
jenkins) write_page "<td></td>" ;;
profitbricks3) write_page "<td></td>" ;;
profitbricks4) write_page "<td></td>" ;;
profitbricks9) write_page "<td></td>" ;;
profitbricks10) write_page "<td></td>" ;;
osuosl*) write_page "<td></td>" ;;
......@@ -150,7 +142,7 @@ build_nodes_health_page() {
URL="https://jenkins.debian.net/view/reproducible/view/Debian_setup_${ARCH}/job/reproducible_setup_schroot_${SUITE}_diffoscope_${ARCH}_${JENKINS_NODENAME}"
BADGE="$URL/badge/icon"
case $JENKINS_NODENAME in
profitbricks3)
osuosl171)
if [ "$SUITE" = "unstable" ]; then
write_page "<td><a href='$URL'><img src='$BADGE' /></a></td>"
else
......@@ -212,8 +204,6 @@ build_graph_overview_pages() {
if [ "$GRAPH" = "jenkins_reproducible_builds" ] ; then
case $JENKINS_NODENAME in
jenkins) write_page "<td></td>" ; continue ;;
profitbricks3) write_page "<td></td>" ; continue ;;
profitbricks4) write_page "<td></td>" ; continue ;;
profitbricks9) write_page "<td></td>" ; continue ;;
profitbricks10) write_page "<td></td>" ; continue ;;
osuosl*) write_page "<td></td>" ; continue ;;
......
#!/bin/bash
# Copyright 2015-2017 Holger Levsen <holger@layer-acht.org>
# Copyright 2015-2019 Holger Levsen <holger@layer-acht.org>
# released under the GPLv=2
DEBUG=false
......@@ -16,7 +16,7 @@ rsync_remote_results() {
echo "$(date -u) - Starting to rsync results for '$PROJECT'."
local RESULTS=$(mktemp --tmpdir=$TEMPDIR -d reproducible-rsync-XXXXXXXXX)
# copy the new results from build node to webserver node
if rsync -r -v -e "ssh -o 'Batchmode = yes'" profitbricks-build3-amd64.debian.net:$BASE/$PROJECT/ $RESULTS 2>/dev/null ; then
if rsync -r -v -e "ssh -o 'Batchmode = yes'" osuosl-build171-amd64.debian.net:$BASE/$PROJECT/ $RESULTS 2>/dev/null ; then
chmod 775 $RESULTS
# move old results out of the way
if [ -d $BASE/$PROJECT ] ; then
......
......@@ -89,7 +89,7 @@ if [ ! -z "$OLDSTUFF" ] ; then
fi
#
# delete old temp directories in /tmp (probably only useful on profitbricks3+4)
# delete old temp directories in /tmp (probably only useful on osuosl171+172)
#
echo "$(date -u) - Deleting temporary directories in /tmp, older than 3 days."
OLDSTUFF=$(find /tmp -maxdepth 1 -type d -mtime +2 -regextype egrep -regex '/tmp/(tmp.*|Test.*|usession-release.*|.*test.*)' -exec ls -lad {} \; || true)
......
#!/bin/bash
# Copyright 2014-2018 Holger Levsen <holger@layer-acht.org>
# Copyright 2014-2019 Holger Levsen <holger@layer-acht.org>
# © 2015 Reiner Herrmann <reiner@reiner-h.de>
# 2016-2018 Alexander Couzens <lynxis@fe80.eu>
# released under the GPLv=2
......@@ -11,8 +11,8 @@
# (which in turn was based on another variant of reproducible_openwrt.sh)
# configuration
GENERIC_NODE1=profitbricks-build3-amd64.debian.net
GENERIC_NODE2=profitbricks-build4-amd64.debian.net
GENERIC_NODE1=osuosl-build171-amd64.debian.net
GENERIC_NODE2=osuosl-build172-amd64.debian.net
OPENWRT_GIT_REPO=https://git.openwrt.org/openwrt/openwrt.git
OPENWRT_GIT_BRANCH=master
DEBUG=false
......
......@@ -25,8 +25,8 @@
# ./deploy_jdn jenkins o167 - deploy on jenkins and osuosl167
# ./deploy_jdn jenkins c9 - deploy on jenkins and codethink-sled9
# ./deploy_jdn jenkins 10 - deploy on jenkins and pb10
# ./deploy_jdn jenkins 3 4 - deploy on jenkins and pb4 and pb4
# ./deploy_jdn jenkins amd64 - deploy on jenkins and all amd64 nods
# ./deploy_jdn jenkins 5 6 - deploy on jenkins and pb6 and pb6
# ./deploy_jdn jenkins amd64 - deploy on jenkins and all amd64 nodes
# ./deploy_jdn upgrade - run "apt-get update && upgrade && clean" everywhere
# ./deploy_jdn upgradey - run "apt-get upgrade -y" everywhere
# ./deploy_jdn rmstamp - delete stamp files everywhere
......@@ -48,8 +48,6 @@ profitbricks-build6-i386.debian.net
profitbricks-build12-i386.debian.net
profitbricks-build16-i386.debian.net
profitbricks-build1-amd64.debian.net
profitbricks-build3-amd64.debian.net
profitbricks-build4-amd64.debian.net
profitbricks-build5-amd64.debian.net
profitbricks-build9-amd64.debian.net
profitbricks-build10-amd64.debian.net
......@@ -94,9 +92,9 @@ ALL_HOSTS=("${HOSTS[@]}")
node_in_the_future () {
case "$1" in
profitbricks-build4-amd64*|profitbricks-build5-amd64*|profitbricks-build6-i386*|profitbricks-build15-amd64*|profitbricks-build16-i386*) true ;;
profitbricks-build5-amd64*|profitbricks-build6-i386*|profitbricks-build15-amd64*|profitbricks-build16-i386*) true ;;
codethink-sled9*|codethink-sled11*|codethink-sled13*|codethink-sled15*) true ;;
osuosl-build170*) true ;;
osuosl-build170*|osuosl-build172) true ;;
*) false ;;
esac
}
......@@ -138,9 +136,6 @@ elif [ "$1" = "jenkins" ] ; then
case "$i" in
1|pb1) HOSTS+=(profitbricks-build1-amd64.debian.net) ;;
2|pb2) HOSTS+=(profitbricks-build2-i386.debian.net) ;;
3|pb3) HOSTS+=(profitbricks-build3-amd64.debian.net) ;;
3+4|pb3+pb4|pb3+4) HOSTS+=(profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net) ;;
4|pb4) HOSTS+=(profitbricks-build4-amd64.debian.net) ;;
5|pb5) HOSTS+=(profitbricks-build5-amd64.debian.net) ;;
6|pb6) HOSTS+=(profitbricks-build6-i386.debian.net) ;;
9|pb9) HOSTS+=(profitbricks-build9-amd64.debian.net) ;;
......
......@@ -88,11 +88,11 @@ iptables -I INPUT -p udp --dport 111 -j DROP
# put schroots on tmpfs for non debian hosts
#
case $(hostname) in
profitbricks-build3*) put_schroots_on_tmpfs ;;
profitbricks-build4*) put_schroots_on_tmpfs ;;
osuosl-build168*) put_schroots_on_tmpfs ;;
osuosl-build169*) put_schroots_on_tmpfs ;;
osuosl-build170*) put_schroots_on_tmpfs ;;
osuosl-build171*) put_schroots_on_tmpfs ;;
osuosl-build172*) put_schroots_on_tmpfs ;;
*) ;;
esac
......@@ -104,12 +104,12 @@ case $(hostname) in
codethink-sled11*) send_back_to_the_future ;;
codethink-sled13*) send_back_to_the_future ;;
codethink-sled15*) send_back_to_the_future ;;
profitbricks-build4*) send_back_to_the_future ;;
profitbricks-build5*) send_back_to_the_future ;;
profitbricks-build6*) send_back_to_the_future ;;
profitbricks-build15*) send_back_to_the_future ;;
profitbricks-build16*) send_back_to_the_future ;;
osuosl-build170*) send_back_to_the_future time.osuosl.org;;
osuosl-build172*) send_back_to_the_future time.osuosl.org;;
*) ;;
esac
......
......@@ -142,34 +142,6 @@ contact.me.command mail -s "Munin notification ${var:host}" root
diskstats_utilization.graph no
diskstats_iops.graph no
[profitbricks-build3-amd64.debian.net]
address 78.137.96.53
use_node_name yes
df._srv_workspace.warning 90
df._srv_workspace.critical 95
diskstats_latency.vda.avgwrwait.warning 0:20
diskstats_latency.vdb.avgwrwait.warning 0:20
diskstats_latency.vda.avgrdwait.warning 0:10
diskstats_latency.vdb.avgrdwait.warning 0:10
diskstats_latency.graph no
diskstats_throughput.graph no
diskstats_utilization.graph no
diskstats_iops.graph no
[profitbricks-build4-amd64.debian.net]
address 85.184.249.167
use_node_name yes
df._srv_workspace.warning 90
df._srv_workspace.critical 95
diskstats_latency.vda.avgwrwait.warning 0:20
diskstats_latency.vdb.avgwrwait.warning 0:20
diskstats_latency.vda.avgrdwait.warning 0:10
diskstats_latency.vdb.avgrdwait.warning 0:10
diskstats_latency.graph no
diskstats_throughput.graph no
diskstats_utilization.graph no
diskstats_iops.graph no
[profitbricks-build5-amd64.debian.net]
address 85.184.249.46
use_node_name yes
......@@ -760,5 +732,5 @@ contact.me.command mail -s "Munin notification ${var:host}" root
# node_order Totals fii.foo.com fay.foo.com
#
[debian.net;]
node_order jenkins.debian.net profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build3-amd64.debian.net profitbricks-build4-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net profitbricks-build11-amd64.debian.net profitbricks-build12-i386.debian.net profitbricks-build15-amd64.debian.net profitbricks-build16-i386.debian.net osuosl-build167-amd64.debian.net osuosl-build168-amd64.debian.net osuosl-build169-amd64.debian.net osuosl-build170-amd64.debian.net osuosl-build171-amd64.debian.net osuosl-build172-amd64.debian.net osuosl-build173-amd64.debian.net osuosl-build174-amd64.debian.net codethink-sled9-arm64.debian.net codethink-sled10-arm64.debian.net codethink-sled11-arm64.debian.net codethink-sled12-arm64.debian.net codethink-sled13-arm64.debian.net codethink-sled14-arm64.debian.net codethink-sled15-arm64.debian.net codethink-sled16-arm64.debian.net bbx15-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cb3a-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net ff4a-armhf-rb.debian.net ff64a-armhf-rb.debian.net odxu4a-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net odu3a-armhf-rb.debian.net jtk1a-armhf-rb.debian.net jtk1b-armhf-rb.debian.net jtx1a-armhf-rb.debian.net jtx1b-armhf-rb.debian.net jtx1c-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2b-armhf-rb.debian.net opi2c-armhf-rb.debian.net p64b-armhf-rb.debian.net p64c-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net jenkins-test-vm.debian.net
node_order jenkins.debian.net profitbricks-build1-amd64.debian.net profitbricks-build2-i386.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net profitbricks-build11-amd64.debian.net profitbricks-build12-i386.debian.net profitbricks-build15-amd64.debian.net profitbricks-build16-i386.debian.net osuosl-build167-amd64.debian.net osuosl-build168-amd64.debian.net osuosl-build169-amd64.debian.net osuosl-build170-amd64.debian.net osuosl-build171-amd64.debian.net osuosl-build172-amd64.debian.net osuosl-build173-amd64.debian.net osuosl-build174-amd64.debian.net codethink-sled9-arm64.debian.net codethink-sled10-arm64.debian.net codethink-sled11-arm64.debian.net codethink-sled12-arm64.debian.net codethink-sled13-arm64.debian.net codethink-sled14-arm64.debian.net codethink-sled15-arm64.debian.net codethink-sled16-arm64.debian.net bbx15-armhf-rb.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net cb3a-armhf-rb.debian.net ff2a-armhf-rb.debian.net ff2b-armhf-rb.debian.net ff4a-armhf-rb.debian.net ff64a-armhf-rb.debian.net odxu4a-armhf-rb.debian.net odxu4b-armhf-rb.debian.net odxu4c-armhf-rb.debian.net odu3a-armhf-rb.debian.net jtk1a-armhf-rb.debian.net jtk1b-armhf-rb.debian.net jtx1a-armhf-rb.debian.net jtx1b-armhf-rb.debian.net jtx1c-armhf-rb.debian.net opi2a-armhf-rb.debian.net opi2b-armhf-rb.debian.net opi2c-armhf-rb.debian.net p64b-armhf-rb.debian.net p64c-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net jenkins-test-vm.debian.net
......@@ -979,7 +979,6 @@ acl localnet src 46.16.76.207/32 # jenkins
acl localnet src 78.137.97.249/32 # jenkins-test-vm
acl localnet src 78.137.99.97/32 # pb1
acl localnet src 46.16.73.166/32 # pb2
acl localnet src 78.137.96.53/32 # pb3
acl localnet src 46.16.78.222/32 # pb9
acl localnet src 78.137.101.155/32 # pb11
acl localnet src 46.16.73.168/32 # pb12
......
......@@ -975,10 +975,8 @@
acl localnet src 10.0.0.0/8 # RFC1918 possible internal network
#acl localnet src 172.16.0.0/12 # RFC1918 possible internal network
#acl localnet src 192.168.0.0/16 # RFC1918 possible internal network
acl localnet src 85.184.249.167/32 # pb4
acl localnet src 85.184.249.46/32 # pb5
acl localnet src 213.244.192.14/32 # pb6
acl localnet src 157.97.110.83/32 # pb7
acl localnet src 85.184.249.68/32 # pb10
acl localnet src 157.97.110.46/32 # pb15
acl localnet src 85.184.249.230/32 # pb16
......
Acquire::http::Proxy "http://78.137.99.97:3128/";
# See /usr/share/postfix/main.cf.dist for a commented, more complete version
# Debian specific: Specifying a file name will cause the first
# line of that file to be used as the name. The Debian default
# is /etc/mailname.
#myorigin = /etc/mailname
smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
biff = no
# appending .domain is the MUA's job.
append_dot_mydomain = no
# Uncomment the next line to generate "delayed mail" warnings
#delay_warning_time = 4h
readme_directory = no
# TLS parameters
smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
smtpd_use_tls=yes
smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
# information on enabling SSL in the smtp client.
myhostname = profitbricks-build3-amd64.debian.net
alias_maps = hash:/etc/aliases
alias_database = hash:/etc/aliases
myorigin = /etc/mailname
mydestination = profitbricks-build3-amd64.debian.net, localhost
relayhost =
#mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
mynetworks = 127.0.0.0/8
mailbox_size_limit = 0
recipient_delimiter = +
inet_interfaces = all
mailbox_command = /usr/bin/procmail -a "$EXTENSION"
# fstab: static file system information for chroots.
# Note that the mount point will be prefixed by the chroot path
# (CHROOT_PATH)
#
# <file system> <mount point> <type> <options> <dump> <pass>
/proc /proc none rw,bind 0 0
/sys /sys none rw,bind 0 0
/dev /dev none rw,bind 0 0
/dev/pts /dev/pts none rw,bind 0 0
/home /home none rw,bind 0 0
/tmp /tmp none rw,bind 0 0
/srv/reproducible-results /srv/reproducible-results none rw,bind 0 0
#/srv/d-i /srv/d-i none rw,bind 0 0
/srv/jenkins /srv/jenkins none rw,bind 0 0
#/srv/live-build /srv/live-build none rw,bind 0 0
# It may be desirable to have access to /run, especially if you wish
# to run additional services in the chroot. However, note that this
# may potentially cause undesirable behaviour on upgrades, such as
# killing services on the host.
#/run /run none rw,bind 0 0
#/run/lock /run/lock none rw,bind 0 0
/dev/shm /dev/shm none rw,bind 0 0
/run/shm /run/shm none rw,bind 0 0
jenkins ALL= \
NOPASSWD: /usr/sbin/debootstrap *, \
/usr/bin/tee /schroots/*, \
/usr/bin/tee -a /schroots/*, \
/usr/bin/tee /etc/schroot/chroot.d/jenkins*, \
/usr/bin/tee -a /etc/schroot/chroot.d/jenkins*, \
/bin/chmod +x /schroots/*, \
/bin/chmod +x /chroots/*, \
/bin/tar -c --exclude ./sys/\* --exclude ./proc/\* -f /schroots/*, \
/usr/sbin/chroot /schroots/*, \
/bin/rm -rf --one-file-system /schroots/*, \
/bin/rm -rf --one-file-system /srv/live-build/*, \
/bin/rm -rf --one-file-system /tmp/*, \
/bin/rm -rv --one-file-system /tmp/*, \
/bin/mv /schroots/* /schroots/*, \
/bin/umount -l /schroots/*, \
/bin/mount --bind *, \
/usr/bin/killall timeout, \
/usr/sbin/slay 1111, \
/usr/sbin/slay 2222, \
/usr/sbin/slay jenkins
# keep these environment variables
Defaults env_keep += "http_proxy", env_reset
Acquire::http::Proxy "http://85.184.249.68:3128/";
# See /usr/share/postfix/main.cf.dist for a commented, more complete version
# Debian specific: Specifying a file name will cause the first
# line of that file to be used as the name. The Debian default
# is /etc/mailname.
#myorigin = /etc/mailname
smtpd_banner = $myhostname ESMTP $mail_name (Debian/GNU)
biff = no
# appending .domain is the MUA's job.
append_dot_mydomain = no
# Uncomment the next line to generate "delayed mail" warnings
#delay_warning_time = 4h
readme_directory = no
# TLS parameters
smtpd_tls_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem
smtpd_tls_key_file=/etc/ssl/private/ssl-cert-snakeoil.key
smtpd_use_tls=yes
smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
# See /usr/share/doc/postfix/TLS_README.gz in the postfix-doc package for
# information on enabling SSL in the smtp client.
myhostname = profitbricks-build4-amd64.debian.net
alias_maps = hash:/etc/aliases
alias_database = hash:/etc/aliases
myorigin = /etc/mailname
mydestination = profitbricks-build4-amd64.debian.net, localhost
relayhost =
#mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128
mynetworks = 127.0.0.0/8
mailbox_size_limit = 0
recipient_delimiter = +
inet_interfaces = all
mailbox_command = /usr/bin/procmail -a "$EXTENSION"
# fstab: static file system information for chroots.
# Note that the mount point will be prefixed by the chroot path
# (CHROOT_PATH)
#
# <file system> <mount point> <type> <options> <dump> <pass>
/proc /proc none rw,bind 0 0
/sys /sys none rw,bind 0 0
/dev /dev none rw,bind 0 0
/dev/pts /dev/pts none rw,bind 0 0
/home /home none rw,bind 0 0
/tmp /tmp none rw,bind 0 0
/srv/reproducible-results /srv/reproducible-results none rw,bind 0 0
#/srv/d-i /srv/d-i none rw,bind 0 0
/srv/jenkins /srv/jenkins none rw,bind 0 0
#/srv/live-build /srv/live-build none rw,bind 0 0
# It may be desirable to have access to /run, especially if you wish
# to run additional services in the chroot. However, note that this
# may potentially cause undesirable behaviour on upgrades, such as
# killing services on the host.
#/run /run none rw,bind 0 0
#/run/lock /run/lock none rw,bind 0 0
/dev/shm /dev/shm none rw,bind 0 0
/run/shm /run/shm none rw,bind 0 0
jenkins ALL= \
NOPASSWD: /usr/sbin/debootstrap *, \
/usr/bin/tee /schroots/*, \
/usr/bin/tee -a /schroots/*, \
/usr/bin/tee /etc/schroot/chroot.d/jenkins*, \
/usr/bin/tee -a /etc/schroot/chroot.d/jenkins*, \
/bin/chmod +x /schroots/*, \
/bin/chmod +x /chroots/*, \
/bin/tar -c --exclude ./sys/\* --exclude ./proc/\* -f /schroots/*, \
/usr/sbin/chroot /schroots/*, \
/bin/rm -rf --one-file-system /schroots/*, \
/bin/rm -rf --one-file-system /srv/live-build/*, \
/bin/rm -rf --one-file-system /tmp/*, \
/bin/rm -rv --one-file-system /tmp/*, \
/bin/mv /schroots/* /schroots/*, \
/bin/umount -l /schroots/*, \
/bin/mount --bind *, \
/usr/bin/killall timeout, \
/usr/sbin/slay 1111, \
/usr/sbin/slay 2222, \
/usr/sbin/slay jenkins
# keep these environment variables
Defaults env_keep += "http_proxy", env_reset
......@@ -320,8 +320,6 @@
- 'wbq0': { my_arch: 'armhf' }
- 'profitbricks1': { my_arch: 'amd64' }
- 'profitbricks2': { my_arch: 'i386' }
- 'profitbricks3': { my_arch: 'amd64' }
- 'profitbricks4': { my_arch: 'amd64' }
- 'profitbricks5': { my_arch: 'amd64' }
- 'profitbricks6': { my_arch: 'i386' }
- 'profitbricks9': { my_arch: 'amd64' }
......@@ -381,8 +379,6 @@
- 'wbq0': { my_arch: 'armhf' }
- 'profitbricks1': { my_arch: 'amd64' }
- 'profitbricks2': { my_arch: 'i386' }
- 'profitbricks3': { my_arch: 'amd64' }
- 'profitbricks4': { my_arch: 'amd64' }
- 'profitbricks5': { my_arch: 'amd64' }
- 'profitbricks6': { my_arch: 'i386' }
- 'profitbricks9': { my_arch: 'amd64' }
......@@ -498,7 +494,7 @@
my_timed: '42 0 * * *'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
my_hname:
- 'profitbricks3': { my_arch: 'amd64' }
- 'osuosl171': { my_arch: 'amd64' }
my_naginator_regex: '^E: Couldn.t download .*/Packages'
- '{name}_{my_task}':
......@@ -638,7 +634,7 @@
my_timed: '42 23 * * 3'
my_trigger: 'reproducible_html_rsync_remote_results'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
my_hname: 'profitbricks3'
my_hname: 'osuosl171'
my_recipients: 'jenkins+reproducible-builds qa-jenkins-scm@lists.alioth.debian.org'
my_timeout: '1440'
......@@ -666,15 +662,15 @@
my_timed: '42 23 1 1 *'
my_shell: '/srv/jenkins/bin/reproducible_setup_mock.sh fedora-23 x86_64'
my_disabled: true
- 'setup_mock_fedora-23_x86_64_profitbricks3':
- 'setup_mock_fedora-23_x86_64_osuosl171':
my_description: 'Setup mock for fedora-23 on X86_64 to test .rpm packages for reproducibility.'
my_timed: '42 23 1 1 *'
my_hname: 'profitbricks3'
my_hname: 'osuosl171'
my_disabled: true
- 'setup_mock_fedora-23_x86_64_profitbricks4':
- 'setup_mock_fedora-23_x86_64_osuosl172':
my_description: 'Setup mock for fedora-23 on X86_64 to test .rpm packages for reproducibility.'
my_timed: '42 23 1 1 *'
my_hname: 'profitbricks4'
my_hname: 'osuosl172'
my_disabled: true
- 'opensuse_import_json':
my_description: 'Import the status json'
......
......@@ -70,7 +70,7 @@ fi
# some nodes need special treatment…
case $HOSTNAME in
profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386|profitbricks-build15-amd64|profitbricks-build16-i386)
profitbricks-build5-amd64|profitbricks-build6-i386|profitbricks-build15-amd64|profitbricks-build16-i386)
# set correct date
set_correct_date de.pool.ntp.org
;;
......@@ -78,7 +78,7 @@ case $HOSTNAME in
# set correct date
set_correct_date de.pool.ntp.org
;;
osuosl-build170-amd64)
osuosl-build170-amd64|osuosl-build172-amd64)
# set correct date
set_correct_date time.osuosl.org
;;
......@@ -114,8 +114,8 @@ 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','jenkins']="$sudo_groups"
user_host_groups['lunar','jenkins']='reproducible'
user_host_groups['lynxis','profitbricks-build3-amd64']="$sudo_groups"
user_host_groups['lynxis','profitbricks-build4-amd64']="$sudo_groups"
user_host_groups['lynxis','osuosl-build171-amd64']="$sudo_groups"
user_host_groups['lynxis','osuosl-build172-amd64']="$sudo_groups"
user_host_groups['hans','osuosl-build168-amd64']="$sudo_groups"
user_host_groups['vagrant','armhf']="$sudo_groups"
user_host_groups['vagrant','arm64']="$sudo_groups"
......@@ -175,10 +175,6 @@ case $HOSTNAME in
TMPFSSIZE=40
TMPSIZE=8
;;
profitbricks-build3-amd64|profitbricks-build4-amd64)
TMPFSSIZE=200
TMPSIZE=30
;;
profitbricks-build*)
TMPFSSIZE=200
TMPSIZE=15
......@@ -313,14 +309,14 @@ if [ -f /etc/debian_version ] ; then
esac
# needed to run the 2nd reproducible builds nodes in the future...
case $HOSTNAME in
profitbricks-build4-amd64|profitbricks-build5-amd64|profitbricks-build6-i386|profitbricks-build15-amd64|profitbricks-build16-i386) DEBS="$DEBS ntpdate" ;;
profitbricks-build5-amd64|profitbricks-build6-i386|profitbricks-build15-amd64|profitbricks-build16-i386) DEBS="$DEBS ntpdate" ;;
codethink-sled9*|codethink-sled11*|codethink-sled13*|codethink-sled15*) DEBS="$DEBS ntpdate" ;;
osuosl-build170-amd64) DEBS="$DEBS ntpdate" ;;
osuosl-build170-amd64|osuosl-build172-amd64) DEBS="$DEBS ntpdate" ;;
*) ;;
esac
# needed to run coreboot/openwrt/netbsd/fedora jobs
case $HOSTNAME in
profitbricks-build3-amd64|profitbricks-build4-amd64) DEBS="$DEBS
osuosl-build171-amd64|osuosl-build172-amd64) DEBS="$DEBS
bison
ca-certificates
cmake
......@@ -486,14 +482,14 @@ if [ -f /etc/debian_version ] ; then
sudo apt-get -y purge unattended-upgrades
fi
# we need mock to build fedora
if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] || [ "$HOSTNAME" = "profitbricks-build4-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then
if [ "$HOSTNAME" = "osuosl-build171-amd64" ] || [ "$HOSTNAME" = "osuosl-build172-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then