reproducible: Remove odc2a; it never really worked, and has been

reinstalled for an experimental project.

README

@@ -146,7 +146,7 @@ Installation tests inside chroot environments.
 ** To test 'armhf' we are using 27 small boards donated by vagrant@d.o:
 *** four quad-cores (cbxi4a, cbxi4b, ff4a, jtx1a, jtx1b) with 4gb ram,
 *** three octo-cores (odxu4, odxu4b and odxu4c) with 2gb ram,
-*** twelve quad-cores (wbq0, cbxi4pro0, ff2a, ff2b, odc2a, odu3a, opi2a, opi2b, opi2c, jtk1b, p64b and p64c) with 2gb ram,
+*** eleven quad-cores (wbq0, cbxi4pro0, ff2a, ff2b, odu3a, opi2a, opi2b, opi2c, jtk1b, p64b and p64c) with 2gb ram,
 *** two dual-core (bbx15 and cb3a) with 2gb ram and,
 *** two quad-cores (rpi2b and rpi2c) with 1gb ram and
 *** three dual-cores (bpi0, hb0 and wbd0) with 1gb ram, each. 

bin/jenkins_node_definitions.sh

@@ -32,7 +32,6 @@ hb0-armhf-rb.debian.net
 jtk1b-armhf-rb.debian.net
 jtx1a-armhf-rb.debian.net
 jtx1b-armhf-rb.debian.net
-odc2a-armhf-rb.debian.net
 odu3a-armhf-rb.debian.net
 odxu4-armhf-rb.debian.net
 odxu4b-armhf-rb.debian.net
@@ -110,9 +109,6 @@ get_node_ssh_port() {
 	  ff64a-armhf-rb.debian.net)
 	    PORT=2250
 	    ;;
-	  odc2a-armhf-rb.debian.net)
-	    PORT=2251
-	    ;;
 	  opi2a-armhf-rb.debian.net)
 	    PORT=2236
 	    ;;

deploy_jdn

@@ -63,7 +63,6 @@ hb0-armhf-rb.debian.net
 jtk1b-armhf-rb.debian.net
 jtx1a-armhf-rb.debian.net
 jtx1b-armhf-rb.debian.net
-odc2a-armhf-rb.debian.net
 odu3a-armhf-rb.debian.net
 odxu4-armhf-rb.debian.net
 odxu4b-armhf-rb.debian.net

hosts/jenkins/etc/munin/munin.conf

@@ -546,16 +546,6 @@ contact.me.command mail -s "Munin notification ${var:host}" root
     diskstats_utilization.graph no
     diskstats_iops.graph no
 
-[odc2a-armhf-rb.debian.net]
-    address ssh://jenkins@odc2a-armhf-rb.debian.net:2251/bin/nc localhost 4949
-    use_node_name yes
-    diskstats_latency.sda.avgwrwait.warning 0:20
-    diskstats_latency.sda.avgrdwait.warning 0:10
-    diskstats_latency.graph no
-    diskstats_throughput.graph no
-    diskstats_utilization.graph no
-    diskstats_iops.graph no
-
 [opi2a-armhf-rb.debian.net]
     address ssh://jenkins@opi2a-armhf-rb.debian.net:2236/bin/nc localhost 4949
     use_node_name yes
@@ -729,5 +719,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 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 bpi0-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 hb0-armhf-rb.debian.net odxu4-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 odc2a-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 rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian.net wbd0-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-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 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 bpi0-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 hb0-armhf-rb.debian.net odxu4-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 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 rpi2b-armhf-rb.debian.net rpi2c-armhf-rb.debian.net wbd0-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net jenkins-test-vm.debian.net
 

hosts/odc2a

-odc2a-armhf-rb
\ No newline at end of file

hosts/odc2a-armhf-rb/etc/apt/apt.conf.d/10no-package-descriptions

-Acquire::Languages "none";

hosts/odc2a-armhf-rb/etc/apt/apt.conf.d/80proxy

-Acquire::http::Proxy "http://10.0.0.15:8000/";
-

hosts/odc2a-armhf-rb/etc/apt/listchanges.conf

-[apt]
-frontend=mail
-email_address=root
-confirm=0
-save_seen=/var/lib/apt/listchanges.db
-which=both

hosts/odc2a-armhf-rb/etc/apt/sources.list

-deb http://deb.debian.org/debian/ stretch main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch main contrib non-free
-
-deb http://deb.debian.org/debian/ stretch-updates main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch-updates main contrib non-free
-
-deb http://security.debian.org/ stretch/updates main contrib non-free
-#deb-src http://security.debian.org/ stretch/updates main contrib non-free
-
-deb http://deb.debian.org/debian/ stretch-backports main contrib non-free
-#deb-src http://deb.debian.org/debian/ stretch-backports main contrib non-free

hosts/odc2a-armhf-rb/etc/cron.d/dsa

-# m h dom mon dow (0|7=sun,1=mon)    command
-
-#
-# cron-jobs for jenkins.debian.net and nodes
-#
-
-MAILTO=root
-
-0 1,13 * * * nobody /usr/bin/chronic /usr/local/bin/dsa-check-running-kernel
-2 1,13 * * * nobody /usr/bin/chronic /usr/local/bin/dsa-check-packages

hosts/odc2a-armhf-rb/etc/logrotate.d/jenkins.debian.net-update_jdn

-/var/log/jenkins/update_jdn.log {
-        daily
-        copytruncate
-        missingok
-        rotate 7
-        compress
-        delaycompress
-        notifempty
-}

hosts/odc2a-armhf-rb/etc/munin/munin-node.conf

-#
-# Example config-file for munin-node
-#
-
-log_level 4
-log_file /var/log/munin/munin-node.log
-pid_file /var/run/munin/munin-node.pid
-
-background 1
-setsid 1
-
-user root
-group root
-
-# This is the timeout for the whole transaction.
-# Units are in sec. Default is 15 min
-#
-# global_timeout 900
-
-# This is the timeout for each plugin.
-# Units are in sec. Default is 1 min
-#
-# timeout 60
-
-# Regexps for files to ignore
-ignore_file [\#~]$
-ignore_file DEADJOE$
-ignore_file \.bak$
-ignore_file %$
-ignore_file \.dpkg-(tmp|new|old|dist)$
-ignore_file \.rpm(save|new)$
-ignore_file \.pod$
-
-# Set this if the client doesn't report the correct hostname when
-# telnetting to localhost, port 4949
-#
-#host_name localhost.localdomain
-
-# A list of addresses that are allowed to connect.  This must be a
-# regular expression, since Net::Server does not understand CIDR-style
-# network notation unless the perl module Net::CIDR is installed.  You
-# may repeat the allow line as many times as you'd like
-
-allow ^127\.0\.0\.1$
-allow ^::1$
-
-# If you have installed the Net::CIDR perl module, you can use one or more
-# cidr_allow and cidr_deny address/mask patterns.  A connecting client must
-# match any cidr_allow, and not match any cidr_deny.  Note that a netmask
-# *must* be provided, even if it's /32
-#
-# Example:
-#
-# cidr_allow 127.0.0.1/32
-# cidr_allow 192.0.2.0/24
-# cidr_deny  192.0.2.42/32
-
-# Which address to bind to;
-host *
-# host 127.0.0.1
-
-# And which port
-port 4949
-
-allow ^78\.137\.96\.196
-hostname odc2a-armhf-rb.debian.net

hosts/odc2a-armhf-rb/etc/munin/plugin-conf.d/df

-[df*]
-env.exclude none unknown iso9660 squashfs udf romfs ramfs debugfs devtmpfs sysfs
-env.exclude_re /srv/workspace/pbuilder /run /dev/disk/by /var/lib/schroot/mount /srv/workspace/varlibschroot /dev/shm /sys/fs/cgroup
-env.warning 92
-env.critical 98
-

hosts/odc2a-armhf-rb/etc/munin/plugin-conf.d/diskstats

-[diskstats]
-env.trim_labels yes
-env.include_only /dev/sda
-

hosts/odc2a-armhf-rb/etc/munin/plugin-conf.d/munin-node

-# This file is used to configure how the plugins are invoked.
-# Place in /etc/munin/plugin-conf.d/ or corresponding directory.
-#
-# PLEASE NOTE: Changes in the plugin-conf.d directory are only
-# read at munin-node startup, so restart at any changes.
-#
-# user <user>         # Set the user to run the plugin as.
-# group <group>       # Set the group to run the plugin as.
-# command <command>   # Run <command> instead of the plugin. %c expands to
-#                       what would normally be run.
-# env.<variable> <value> # Sets <variable> in the plugin's environment, see the
-#                       individual plugins to find out which variables they
-#                       care about.
-
-
-[amavis]
-group adm
-env.MUNIN_MKTEMP /bin/mktemp -p /tmp/ $1
-env.amavislog /var/log/mail.info
-
-[apt]
-user root
-
-[courier_mta_mailqueue]
-group daemon
-
-[courier_mta_mailstats]
-group adm
-
-[courier_mta_mailvolume]
-group adm
-
-[cps*]
-user root
-
-[exim_mailqueue]
-group adm, (Debian-exim)
-
-[exim_mailstats]
-group adm, (Debian-exim)
-env.logdir /var/log/exim4/
-env.logname mainlog
-
-[fw_conntrack]
-user root
-
-[fw_forwarded_local]
-user root
-
-[hddtemp_smartctl]
-user root
-
-[hddtemp2]
-user root
-
-[if_*]
-user root
-
-[if_err_*]
-user nobody
-
-[ip_*]
-user root
-
-[ipmi_*]
-user root
-
-[mysql*]
-user root
-env.mysqlopts --defaults-file=/etc/mysql/debian.cnf
-env.mysqluser debian-sys-maint
-env.mysqlconnection DBI:mysql:mysql;mysql_read_default_file=/etc/mysql/debian.cnf
-
-[postfix_mailqueue]
-user postfix
-
-[postfix_mailstats]
-group adm
-
-[postfix_mailvolume]
-group adm
-env.logfile mail.log
-
-[smart_*]
-user root
-
-[vlan*]
-user root
-
-[ejabberd*]
-user ejabberd
-env.statuses available away chat xa
-env.days 1 7 30
-
-[dhcpd3]
-user root
-env.leasefile /var/lib/dhcp3/dhcpd.leases
-env.configfile /etc/dhcp3/dhcpd.conf
-
-[jmx_*]
-env.ip 127.0.0.1
-env.port 5400
-
-[samba]
-user root
-
-[munin_stats]
-user munin
-group munin
-
-[postgres_*]
-user postgres
-env.PGUSER postgres
-env.PGPORT 5432
-
-[fail2ban]
-user root

hosts/odc2a-armhf-rb/etc/munin/plugins/jenkins_reproducible_builds

-#!/bin/sh
-# -*- sh -*-
-
-: << =cut
-
-=head1 NAME
-
-jenkins_reproducible_builds - Plugin to measure number of reproducible builds running
-
-=head1 AUTHOR
-
-Contributed by Holger Levsen
-
-=head1 LICENSE
-
-GPLv2
-
-=head1 MAGIC MARKERS
-
- #%# family=auto
- #%# capabilities=autoconf
-
-=cut
-
-. $MUNIN_LIBDIR/plugins/plugin.sh
-
-if [ "$1" = "autoconf" ]; then
-	echo yes
-	exit 0
-fi
-
-JOB_PREFIXES="first second"
-if [ "$1" = "config" ]; then
-	echo 'graph_title Concurrent reproducible builds running'
-	echo 'graph_args --base 1000 -l 0 '
-	echo 'graph_scale no'
-	echo 'graph_total total'
-	echo 'graph_vlabel Concurrent reproducible builds running'
-	echo 'graph_category jenkins'
-	draw=AREA
-	for PREFIX in $JOB_PREFIXES ; do
-		echo "jenkins_reproducible_${PREFIX}_build.label $PREFIX build"
-		echo "jenkins_reproducible_${PREFIX}_build.draw $draw"
-		if [ "$draw" = "AREA" ] ; then draw=STACK ; fi
-	done
-	exit 0
-fi
-
-for PREFIX in $JOB_PREFIXES ; do
-	if [ "$PREFIX" = "first" ] ; then
-		NR=$(pgrep -fc "bin/bash /srv/jenkins/bin/reproducible_build.sh 1")
-	else
-		NR=$(pgrep -fc "bin/bash /srv/jenkins/bin/reproducible_build.sh 2")
-	fi
-	echo "jenkins_reproducible_${PREFIX}_build.value $NR"
-	done

hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/B01_cleanup

-#!/bin/sh
-
-set -e
-
-BUILDDIR="${BUILDDIR:-/tmp/buildd}"
-
-# exit if we are in the same UTS namespace as init ( != 2nd build )
-[ "$(readlink /proc/1/ns/uts)" = "$(readlink /proc/self/ns/uts)" ] && exit 0
-
-# cease using disorderfs
-if [ -d /tmp/disorderfs ] ; then
-	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -z -u "$BUILDDIR"
-	rmdir "$BUILDDIR"
-	mv /tmp/disorderfs "$BUILDDIR"
-	echo " done."
-fi

hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/C01_cleanup

-#!/bin/sh
-
-set -e
-
-BUILDDIR="${BUILDDIR:-/tmp/buildd}"
-
-echo "debug output: disk usage on $(hostname) at $(date -u)"
-df -h
-echo
-
-# exit if we are in the same UTS namespace as init ( != 2nd build )
-[ "$(readlink /proc/1/ns/uts)" = "$(readlink /proc/self/ns/uts)" ] && exit 0
-
-# cease using disorderfs
-if [ -d /tmp/disorderfs ] ; then
-	echo -n "Unmounting /tmp/disorderfs…"
-	fusermount -z -u "$BUILDDIR"
-	rmdir "$BUILDDIR"
-	mv /tmp/disorderfs "$BUILDDIR"
-	echo " done."
-fi

hosts/odc2a-armhf-rb/etc/pbuilder/rebuild-hooks/D01_modify_environment

-#!/bin/sh
-
-set -e
-
-BUILDDIR="${BUILDDIR:-/tmp/buildd}"
-
-# exit if we are in the same UTS namespace as init ( != 2nd build )
-[ "$(readlink /proc/1/ns/uts)" = "$(readlink /proc/self/ns/uts)" ] && exit 0
-
-#
-# doing variations for the 2nd builds:
-#
-REAL_HOSTNAME=$(hostname)
-echo "disorder-fs debug: Running on $REAL_HOSTNAME."
-
-echo "I: Changing host+domainname to test build reproducibility" >&2
-sed -e '/^127.0.0.1/s/$/ i-capture-the-hostname i-capture-the-hostname.i-capture-the-domain/' -i /etc/hosts
-hostname i-capture-the-hostname
-domainname i-capture-the-domain
-echo "I: Adding a custom variable just for the fun of it..." >&2
-export CAPTURE_ENVIRONMENT="I capture the environment"
-
-echo "I: Changing /bin/sh to bash" >&2
-echo "dash dash/sh boolean false" | debconf-set-selections
-DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash
-if [ -n "$BUILDUSERNAME" ] ; then
-	echo "I: Setting $BUILDUSERNAME's login shell to /bin/bash" >&2
-	usermod -s /bin/bash $BUILDUSERNAME
-	if [ -n "$BUILDUSERGECOS" ] ; then
-		echo "I: Setting $BUILDUSERNAME's GECOS to $BUILDUSERGECOS" >&2
-		usermod -c "$BUILDUSERGECOS" $BUILDUSERNAME
-	fi
-fi
-
-# disable disorderfs due to #844498
-#exit 0
-# use disorderfs on armhf only for now
-if [ "$(dpkg --print-architecture)" != "armhf" ] ; then
-	exit 0
-elif [ "$REAL_HOSTNAME" != "bpi0" ] ; then
-	exit 0
-else
-	echo "disorder-fs debug: bpi0, yay, enabling disorderfs now…"
-fi
-
-# use disorderfs
-if [ -x /usr/bin/disorderfs ] ; then
-	echo -n "Moving $BUILDDIR to /tmp/disorderfs and mounting this as $BUILDDIR via the fuse disorderfs…"
-	mknod -m 666 /dev/fuse c 10 229
-	mv "$BUILDDIR" /tmp/disorderfs
-	mkdir "$BUILDDIR"
-	disorderfs --multi-user=yes /tmp/disorderfs "$BUILDDIR"
-	echo " done."
-else
-	echo "Warning: disorderfs not available."
-fi

hosts/odc2a-armhf-rb/etc/pbuilderrc

-# this is your configuration file for pbuilder.
-# the file in /usr/share/pbuilder/pbuilderrc is the default template.
-# /etc/pbuilderrc is the one meant for overwriting defaults in
-# the default template
-#
-# read pbuilderrc.5 document for notes on specific options.
-#
-# cater for different locations
-case $HOSTNAME in
-	jenkins|jenkins-test-vm|profitbricks-build*)
-			MIRRORSITE=http://deb.debian.org/debian ;;
-	bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|odc*|wbd0|rpi2*|ff*|ff4*|opi2*|jt?1*|p64*)
-
-			MIRRORSITE=http://deb.debian.org/debian ;;
-	codethink*)
-			MIRRORSITE=http://deb.debian.org/debian ;;
-	*)
-			echo "unsupported host, exiting." ; exit 1 ;;
-esac
-# only use eatmydata on armhf+i386 - on amd64+arm64 we build in tmpfs anyway
-case $HOSTNAME in
-	profitbricks-build*i386)
-		EATMYDATA=yes ;;
-	bbx15|bpi0|cb3*|cbxi4*|hb0|wbq0|odxu4*|odu3*|odc*|wbd0|rpi2*|ff*|ff4*|opi2*|jt?1*|p64*)
-		EATMYDATA=yes ;;
-	*)	;;
-esac
-EXTRAPACKAGES=""	# better list them in bin/reproducible_setup_pbuilder.sh
-APTCACHE=""
-COMPRESSPROG="pigz"
-BUILDPLACE=/srv/workspace/pbuilder  # build in /srv/workspace, which is in tmpfs
-
-# set PATH to predictable values, see #780729 and #780725
-PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games"
-
-# used for reproducible builds tests, when doing the 2nd build
-if [ "$(readlink /proc/1/ns/uts)" != "$(readlink /proc/self/ns/uts)" ]; then
-	PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path"
-fi
-
-# needed to ignore failures due to running 398 days in the future…
-# (only on those 4 nodes running in the future…)
-if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] || \
-   [ "$HOSTNAME" = "profitbricks-build15-amd64" ] || [ "$HOSTNAME" = "profitbricks-build16-i386" ] || \
-   [ "$HOSTNAME" = "codethink-sled9-arm64" ] || [ "$HOSTNAME" = "codethink-sled11-arm64" ] || \
-   [ "$HOSTNAME" = "codethink-sled13-arm64" ] || [ "$HOSTNAME" = "codethink-sled15-arm64" ] ; then
-	case "$PBUILDER_OPERATION" in
-		create)
-			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-			;;
-		*)	;;
-	esac
-fi