[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: add new host, profitbricks-build3-amd64 to run our twitterbot on
Holger Levsen
gitlab at salsa.debian.org
Thu Apr 30 18:56:13 BST 2020
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
fcd3fcfb by Holger Levsen at 2020-04-30T19:56:01+02:00
reproducible: add new host, profitbricks-build3-amd64 to run our twitterbot on
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
10 changed files:
- THANKS.head
- bin/common-functions.sh
- bin/jenkins_node_definitions.sh
- bin/reproducible_html_nodes_info.sh
- hosts/jenkins/etc/munin/munin.conf
- hosts/profitbricks-build10-amd64/etc/squid/squid.conf
- + hosts/profitbricks-build3-amd64/etc/apt/apt.conf.d/80proxy
- + hosts/profitbricks-build3-amd64/etc/postfix/main.cf
- init_node
- nodes/list.yml
Changes:
=====================================
THANKS.head
=====================================
@@ -14,6 +14,7 @@ Debian packages for t.r-b.o
Debian packages for t.r-b.o
** 16 cores and 48 GB memory for profitbricks-build15-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-build16-i386.debian.net sed for building i386 Debian packages for t.r-b.o, running in the future
+ ** 2 cores and 4 GB memory for profitbricks-build3-amd64.debian.net used for our twitterbot.
** 2 cores and 8 GB memory for profitbricks-build7-amd64.debian.net used for buildinfos.debian.net
** 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 chroot-installation jobs
=====================================
bin/common-functions.sh
=====================================
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set noexpandtab:
-# Copyright 2014-2019 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2020 Holger Levsen <holger at layer-acht.org>
# © 2018 Mattia Rizzolo <mattia at mapreri.org>
# released under the GPLv2
@@ -129,7 +129,7 @@ else
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-build5*|profitbricks-build6*|profitbricks-build7*|profitbricks-build10*|profitbricks-build15*|profitbricks-build16*)
+ profitbricks-build3*|profitbricks-build5*|profitbricks-build6*|profitbricks-build7*|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/jenkins_node_definitions.sh
=====================================
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2015-2019 Holger Levsen <holger at layer-acht.org>
+# Copyright 2015-2020 Holger Levsen <holger at layer-acht.org>
# released under the GPLv2
# define Debian build nodes in use for tests.reproducible-builds.org/debian/
=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -17,6 +17,7 @@ common_init "$@"
explain_nodes() {
case $JENKINS_NODENAME in
jenkins) ;;
+ profitbricks3) write_page "<br /><small>(twitterbot for irc:#reproducible-builds)</small>" ;;
profitbricks7) write_page "<br /><small>(buildinfos.debian.net)</small>" ;;
profitbricks9) write_page "<br /><small>(jenkins.d.n rebootstrap jobs)</small>" ;;
profitbricks10) write_page "<br /><small>(jenkins.d.n chroot-installation jobs and http-proxy)</small>" ;;
@@ -66,7 +67,11 @@ build_nodes_health_page() {
for NODE in $BUILD_NODES ; do
REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES $NODE"
- if [ "$NODE" = "profitbricks-build6-i386.debian.net" ] ; then
+ if [ "$NODE" = "profitbricks-build2-i386.debian.net" ] ; then
+ # pb3 twitterbot
+ REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES profitbricks-build3-amd64.debian.net"
+ elif [ "$NODE" = "profitbricks-build6-i386.debian.net" ] ; then
+ # pb7 reproducible fdroid jobs
# pb9 rebootstrap jobs
# pb10 chroot jobs
REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES profitbricks-build7-amd64.debian.net profitbricks-build9-amd64.debian.net profitbricks-build10-amd64.debian.net"
@@ -112,6 +117,7 @@ build_nodes_health_page() {
# worker.log links
case $JENKINS_NODENAME in
jenkins) write_page "<td></td>" ;;
+ profitbricks3) write_page "<td></td>" ;;
profitbricks7) write_page "<td></td>" ;;
profitbricks9) write_page "<td></td>" ;;
profitbricks10) write_page "<td></td>" ;;
@@ -129,6 +135,7 @@ build_nodes_health_page() {
for SUITE in ${SUITES} ; do
case $JENKINS_NODENAME in
jenkins) write_page "<td></td>" ;;
+ profitbricks3) write_page "<td></td>" ;;
profitbricks7) write_page "<td></td>" ;;
profitbricks9) write_page "<td></td>" ;;
profitbricks10) write_page "<td></td>" ;;
@@ -216,6 +223,7 @@ 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 ;;
profitbricks7) write_page "<td></td>" ; continue ;;
profitbricks9) write_page "<td></td>" ; continue ;;
profitbricks10) write_page "<td></td>" ; continue ;;
=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -142,6 +142,20 @@ contact.me.command mail -s "Munin notification ${var:host}" root
diskstats_utilization.graph no
diskstats_iops.graph no
+[profitbricks-build3-amd64.debian.net]
+ address 185.48.119.12
+ 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.130
use_node_name yes
@@ -749,5 +763,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-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build7-amd64.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-build3-amd64.debian.net profitbricks-build5-amd64.debian.net profitbricks-build6-i386.debian.net profitbricks-build7-amd64.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
=====================================
hosts/profitbricks-build10-amd64/etc/squid/squid.conf
=====================================
@@ -975,6 +975,7 @@
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 185.48.119.12/32 # pb3
acl localnet src 85.184.249.130/32 # pb5
acl localnet src 213.244.192.14/32 # pb6
acl localnet src 157.97.110.83/32 # pb7
=====================================
hosts/profitbricks-build3-amd64/etc/apt/apt.conf.d/80proxy
=====================================
@@ -0,0 +1 @@
+Acquire::http::Proxy "http://85.184.249.68:3128/";
=====================================
hosts/profitbricks-build3-amd64/etc/postfix/main.cf
=====================================
@@ -0,0 +1,41 @@
+# 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"
=====================================
init_node
=====================================
@@ -1,17 +1,17 @@
#!/bin/bash
#
-# Copyright 2014-2018 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2020 Holger Levsen <holger at layer-acht.org>
#
# released under the GPLv2
#
-# initial setup for new build nodes
+# initial setup for new nodes
# - this script must be run as root
# - it's also assumed that this script is once manually scp'ed to the new node
# and run there manually once :)
# let's check our assumptions first…
if [ $(id -u) -ne 0 ] ; then
- echo we need sudo… exiting.
+ echo This needs to be run as root… exiting.
exit 1
fi
@@ -29,7 +29,7 @@ addgroup --system jenkins-adm
adduser --system --shell /bin/bash --home /home/jenkins-adm --ingroup jenkins-adm --disabled-login jenkins-adm
usermod -G jenkins jenkins-adm
echo '%jenkins-adm ALL= NOPASSWD: ALL' > /etc/sudoers.d/jenkins-adm # will be overwritten later
-grep -q stretch-backports /etc/apt/sources.list || echo "deb http://deb.debian.org/debian/ stretch-backports main contrib non-free" >> /etc/apt/sources.list
+grep -q buster-backports /etc/apt/sources.list || echo "deb http://deb.debian.org/debian/ buster-backports main contrib non-free" >> /etc/apt/sources.list
chown jenkins-adm.jenkins-adm /home/jenkins-adm
cd ~jenkins-adm
[ -x /usr/bin/git ] || apt-get install -y git
=====================================
nodes/list.yml
=====================================
@@ -14,6 +14,10 @@
ip: 46.16.73.166
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFez9q/k1rxbsQ2odoGTvThfyi+TlYTKNagNsjTcQrYA root at profitbricks-build2-i386
+- hostname: profitbricks-build3-amd64.debian.net
+ ip: 185.48.119.12
+ keys:
+ - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILxgSxHwyUH+XuB7uAGhtU60j9AilWAeHWSTrtw9CVwU root at debian
- hostname: profitbricks-build5-amd64.debian.net
ip: 85.184.249.130
keys:
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/fcd3fcfb68c4cc9b91dce6283cf656662e4509c3
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/fcd3fcfb68c4cc9b91dce6283cf656662e4509c3
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20200430/c0ac70c4/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list