[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible: document new nodes at OSUOSL
Holger Levsen (@holger)
gitlab at salsa.debian.org
Tue Feb 14 10:35:26 GMT 2023
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
f57dbeb1 by Holger Levsen at 2023-02-14T11:26:48+01:00
reproducible: document new nodes at OSUOSL
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
f05f9ce7 by Holger Levsen at 2023-02-14T11:32:37+01:00
reproducible: decomission osuosl174
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
16 changed files:
- README.infrastructure
- THANKS.head
- TODO
- bin/common-functions.sh
- bin/jenkins_node_definitions.sh
- bin/reproducible_html_nodes_info.sh
- deploy_jdn
- hosts/jenkins/etc/munin/munin.conf
- − hosts/osuosl174-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/osuosl174-amd64/etc/network/interfaces
- − hosts/osuosl174-amd64/etc/postfix/main.cf
- − hosts/osuosl174-amd64/etc/schroot/default/fstab
- − hosts/osuosl174-amd64/etc/squid/squid.conf
- job-cfg/reproducible.yaml
- nodes/list.yml
- update_jdn.sh
Changes:
=====================================
README.infrastructure
=====================================
@@ -40,11 +40,19 @@ can remove the PTR records and unblock the IP addresses.
==== nodes at osuosl.org
-We now also have 8 nodes running at osuosl.org. Contact via #osuosl on freenode or mail to
+We also have 5 nodes running at osuosl.org. Contact via #osuosl on freenode or mail to
support at osuosl.org mentioning the machine name in the subject.
The nodes are used for these jobs:
+* osuosl1-amd64: unused
+* osuosl2-amd64: unused
+* osuosl3-amd64: unused
+* osuosl4-amd64: snapshot.r-b.o, soon not anymore
+* osuosl5-amd64: to be snapshot.r-b.o
+
+===== legacy nodes at OSUOSL
+
* osuosl167: debian-janitor and mmdebstrap-jenkins jobs
** janitor and openqa worker should be split on different nodes
* osuosl168: openqa.d.n workers
@@ -53,10 +61,6 @@ The nodes are used for these jobs:
** is constantly online (in jenkins) now, which is not how we like it and still doesnt solve the netbsd job probs
* osuosl172: openwrt, coreboot (future)
* osuosl173: Debian live-builds / bootstrap jobs
-* osuosl174:
- * bwiedemann: opensuse tests,
- * vagrant: ocasional manual tests, highly useful, wants a replacement
-** could use much less ressources
* osuosl184: archlinux, alpine
Please note that the machines are called gccXXX at osuosl.org, though usually
=====================================
THANKS.head
=====================================
@@ -45,7 +45,6 @@ link:https://jenkins.debian.net/["jenkins.debian.net"] would not be possible wit
** 32 cores with 144 GB memory for osuosl171-amd64.debian.net used for building OpenWrt, coreboot and NetBSD for t.r-b.o
** 32 cores with 144 GB memory for osuosl172-amd64.debian.net used for building OpenWrt, coreboot for t.r-b.o
** 32 cores with 144 GB memory for osuosl173-amd64.debian.net used for building Debian live builds for t.r-b.o
- ** 32 cores with 144 GB memory for osuosl174-amd64.debian.net used for build tests for openSUSE
==== Past sponsors
=====================================
TODO
=====================================
@@ -29,7 +29,8 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
=== nodes at OSUOSL
-* three new nodes
+* three/five new nodes
+** change DNS names
** make sure they can send mail to root
** fil would like to run 2 worker on each of them, this needs bookworm, which should be fine
** run one of the three in the future or rather not?
=====================================
bin/common-functions.sh
=====================================
@@ -236,7 +236,7 @@ jenkins_zombie_check() {
# related however is that I issued a reboot (via running
# /sbin/reboot) right before the zombies appeared...
#
- ZOMBIES="$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|chroot-installation_buster_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc[5-9]($|_)|rebootstrap_.*_gcc1[01]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|diffoscope_archlinux|openwrt-target-ath97|profitbricks|pool_buildinfos_suites|g-i-installation|reproducible_compare_Debian_sha1sums|bbx15|cb3a|ff2a|ff2b|jtk1a|jtk1b|odxu4a|odxu4b|odu3a|opi2a|opi2c|p64b|p64c|ar71xx|reproducible_debian_live_build$|chroot-installation_stretch|chroot-installation_bullseye*upgrade_to_sid|rebuilder_prototype|osuosl169|fakeroot-foreign|fdroid' || true)"
+ ZOMBIES="$(ls -1d /var/lib/jenkins/jobs/* | egrep 'strip-nondeterminism|reprotest|reproducible_(builder_(amd64|i386|armhf|arm64)|setup_(pbuilder|schroot)_testing)|chroot-installation_wheezy|aptdpkg|stretch_install_education-thin-client-server|jessie_multiarch_versionskew|dpkg_stretch_find_trigger_cycles|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|chroot-installation_buster_.*_upgrade_to_sid|piuparts_.*_jessie|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc[5-9]($|_)|rebootstrap_.*_gcc1[01]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|diffoscope_archlinux|openwrt-target-ath97|profitbricks|pool_buildinfos_suites|g-i-installation|reproducible_compare_Debian_sha1sums|bbx15|cb3a|ff2a|ff2b|jtk1a|jtk1b|odxu4a|odxu4b|odu3a|opi2a|opi2c|p64b|p64c|ar71xx|reproducible_debian_live_build$|chroot-installation_stretch|chroot-installation_bullseye*upgrade_to_sid|rebuilder_prototype|osuosl169|osuosl174|fakeroot-foreign|fdroid' || true)"
if [ ! -z "$ZOMBIES" ] ; then
DIRTY=true
figlet 'zombies!!!'
=====================================
bin/jenkins_node_definitions.sh
=====================================
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2015-2020 Holger Levsen <holger at layer-acht.org>
+# Copyright 2015-2023 Holger Levsen <holger at layer-acht.org>
# released under the GPLv2
# define Debian build nodes in use for tests.reproducible-builds.org/debian/
@@ -51,8 +51,7 @@ osuosl184-amd64.debian.net
osuosl170-amd64.debian.net
osuosl171-amd64.debian.net
osuosl172-amd64.debian.net
-osuosl173-amd64.debian.net
-osuosl174-amd64.debian.net"
+osuosl173-amd64.debian.net"
NODE_RUN_IN_THE_FUTURE=false
get_node_information() {
=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -28,7 +28,6 @@ explain_nodes() {
osuosl171) write_page "<br /><small>(r-b OpenWrt, NetBSD, Coreboot builds)</small>" ;;
osuosl172) write_page "<br /><small>(r-b OpenWrt, Coreboot builds)</small>" ;;
osuosl173) write_page "<br /><small>(r-b Debian live-build / bootstrap jobs)</small>" ;;
- osuosl174) write_page "<br /><small>(r-b openSUSE)</small>" ;;
ionos1) write_page "<br /><small>(r-b Debian builds and http-proxy)</small>" ;;
codethink16) write_page "<br /><small>(r-b Debian builds and http-proxy)</small>" ;;
*) write_page "<br /><small>(r-b Debian builds)</small>" ;;
=====================================
deploy_jdn
=====================================
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set noexpandtab:
#
-# Copyright 2014-2021 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2023 Holger Levsen <holger at layer-acht.org>
# © 2018 Mattia Rizzolo <mattia at debian.org>
#
# released under the GPLv2
@@ -140,7 +140,6 @@ elif [ "$1" = "jenkins" ] || [ "$1" = "only" ] ; then
o171) HOSTS+=(osuosl171-amd64.debian.net) ;;
o172) HOSTS+=(osuosl172-amd64.debian.net) ;;
o173) HOSTS+=(osuosl173-amd64.debian.net) ;;
- o174) HOSTS+=(osuosl174-amd64.debian.net) ;;
o184) HOSTS+=(osuosl184-amd64.debian.net) ;;
c9|cs9|ct9) HOSTS+=(codethink9-arm64.debian.net) ;;
c10|cs10|ct10) HOSTS+=(codethink10-arm64.debian.net) ;;
=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -608,16 +608,6 @@ contact.me.command mail -s "Munin notification ${var:host}" root
diskstats_utilization.graph no
diskstats_iops.graph no
-[osuosl174-amd64.debian.net]
- address ssh://jenkins@osuosl174-amd64.debian.net:45053/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
-
[freebsd-jenkins.debian.net]
address 46.16.73.236
use_node_name yes
@@ -673,7 +663,7 @@ 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 ionos1-amd64.debian.net ionos2-i386.debian.net ionos3-amd64.debian.net ionos5-amd64.debian.net ionos6-i386.debian.net ionos7-amd64.debian.net ionos9-amd64.debian.net ionos10-amd64.debian.net ionos11-amd64.debian.net ionos12-i386.debian.net ionos15-amd64.debian.net ionos16-i386.debian.net osuosl167-amd64.debian.net osuosl168-amd64.debian.net osuosl170-amd64.debian.net osuosl171-amd64.debian.net osuosl172-amd64.debian.net osuosl173-amd64.debian.net osuosl174-amd64.debian.net osuosl184-amd64.debian.net codethink9-arm64.debian.net codethink10-arm64.debian.net codethink11-arm64.debian.net codethink12-arm64.debian.net codethink13-arm64.debian.net codethink14-arm64.debian.net codethink15-arm64.debian.net codethink16-arm64.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net ff4a-armhf-rb.debian.net ff64a-armhf-rb.debian.net jtx1a-armhf-rb.debian.net jtx1b-armhf-rb.debian.net jtx1c-armhf-rb.debian.net virt32a-armhf-rb.debian.net virt32b-armhf-rb.debian.net virt32c-armhf-rb.debian.net virt64a-armhf-rb.debian.net virt64b-armhf-rb.debian.net virt64c-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net reproducible1-amd64.osuosl.org reproducible3-amd64.osuosl.org reproducible3-amd64.osuosl.org
+ node_order jenkins.debian.net ionos1-amd64.debian.net ionos2-i386.debian.net ionos3-amd64.debian.net ionos5-amd64.debian.net ionos6-i386.debian.net ionos7-amd64.debian.net ionos9-amd64.debian.net ionos10-amd64.debian.net ionos11-amd64.debian.net ionos12-i386.debian.net ionos15-amd64.debian.net ionos16-i386.debian.net osuosl167-amd64.debian.net osuosl168-amd64.debian.net osuosl170-amd64.debian.net osuosl171-amd64.debian.net osuosl172-amd64.debian.net osuosl173-amd64.debian.net osuosl184-amd64.debian.net codethink9-arm64.debian.net codethink10-arm64.debian.net codethink11-arm64.debian.net codethink12-arm64.debian.net codethink13-arm64.debian.net codethink14-arm64.debian.net codethink15-arm64.debian.net codethink16-arm64.debian.net cbxi4a-armhf-rb.debian.net cbxi4b-armhf-rb.debian.net cbxi4pro0-armhf-rb.debian.net ff4a-armhf-rb.debian.net ff64a-armhf-rb.debian.net jtx1a-armhf-rb.debian.net jtx1b-armhf-rb.debian.net jtx1c-armhf-rb.debian.net virt32a-armhf-rb.debian.net virt32b-armhf-rb.debian.net virt32c-armhf-rb.debian.net virt64a-armhf-rb.debian.net virt64b-armhf-rb.debian.net virt64c-armhf-rb.debian.net wbq0-armhf-rb.debian.net freebsd-jenkins.debian.net reproducible1-amd64.osuosl.org reproducible3-amd64.osuosl.org reproducible3-amd64.osuosl.org
[reproducible-builds.org;]
node_order rb-mail1.reproducible-builds.org snapshot.reproducible-builds.org
=====================================
hosts/osuosl174-amd64/etc/apt/apt.conf.d/80proxy deleted
=====================================
@@ -1 +0,0 @@
-Acquire::http::Proxy "http://127.0.0.1:3128";
=====================================
hosts/osuosl174-amd64/etc/network/interfaces deleted
=====================================
@@ -1,17 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-source /etc/network/interfaces.d/*
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# The primary network interface
-allow-hotplug enp6s0
-#iface enp6s0 inet dhcp
-iface enp6s0 inet static
- address 10.6.5.53
- netmask 255.255.252.0
- gateway 10.6.4.1
-
=====================================
hosts/osuosl174-amd64/etc/postfix/main.cf deleted
=====================================
@@ -1,41 +0,0 @@
-# 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 = osuosl174-amd64.debian.net
-alias_maps = hash:/etc/aliases
-alias_database = hash:/etc/aliases
-myorigin = /etc/mailname
-mydestination = osuosl174-amd64.debian.net, localhost
-relayhost = mail.holgerlevsen.de
-#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"
=====================================
hosts/osuosl174-amd64/etc/schroot/default/fstab deleted
=====================================
@@ -1,27 +0,0 @@
-# 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
-tmpfs /tmp tmpfs defaults 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-specific stuff:
-# <file system> <mount point> <type> <options> <dump> <pass>
-/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
=====================================
hosts/osuosl174-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.
=====================================
job-cfg/reproducible.yaml
=====================================
@@ -365,7 +365,6 @@
- 'osuosl171': { my_arch: 'amd64' }
- 'osuosl172': { my_arch: 'amd64' }
- 'osuosl173': { my_arch: 'amd64' }
- - 'osuosl174': { my_arch: 'amd64' }
- 'reproducible1': { my_arch: 'amd64' }
- 'reproducible2': { my_arch: 'amd64' }
- 'reproducible3': { my_arch: 'amd64' }
@@ -420,7 +419,6 @@
- 'osuosl171': { my_arch: 'amd64' }
- 'osuosl172': { my_arch: 'amd64' }
- 'osuosl173': { my_arch: 'amd64' }
- - 'osuosl174': { my_arch: 'amd64' }
- 'reproducible1': { my_arch: 'amd64' }
- 'reproducible2': { my_arch: 'amd64' }
- 'reproducible3': { my_arch: 'amd64' }
=====================================
nodes/list.yml
=====================================
@@ -110,11 +110,6 @@
port: 45052
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILbVh1pcBRs/m5Skt56F3KAVxQFq9mM2eII8f1IfE3A2 root at gcc173
-- hostname: osuosl174-amd64.debian.net
- ip: 128.193.126.200
- port: 45053
- keys:
- - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEtj8tDmRAoZUBum1GqPupVSq1hhjtt0V8SL9zOxassT root at gcc174
- hostname: osuosl184-amd64.debian.net
ip: 128.193.126.200
port: 45077
=====================================
update_jdn.sh
=====================================
@@ -1,6 +1,6 @@
#!/bin/bash
# vim: set noexpandtab:
-# Copyright 2012-2022 Holger Levsen <holger at layer-acht.org>
+# Copyright 2012-2023 Holger Levsen <holger at layer-acht.org>
# © 2018 Mattia Rizzolo <mattia at debian.org>
# released under the GPLv2
@@ -133,11 +133,11 @@ user_host_groups['hans','osuosl168-amd64']="$sudo_groups"
user_host_groups['flx','osuosl168-amd64']="$sudo_groups"
user_host_groups['jspricke','osuosl168-amd64']="$sudo_groups"
user_host_groups['vagrant','*']="$sudo_groups"
-user_host_groups['bernhard','osuosl174-amd64']="$sudo_groups"
user_host_groups['santiago','ionos3-amd64']="$sudo_groups"
user_host_groups['fpierret','snapshot']="$sudo_groups"
user_host_groups['rclobus','osuosl173-amd64']="$sudo_groups"
user_host_groups['phil','osuosl168-amd64']="$sudo_groups"
+user_host_groups['bernhard','xxxxx']="$sudo_groups"
u_shell['mattia']='/bin/zsh'
u_shell['lynxis']='/usr/bin/fish'
@@ -400,8 +400,6 @@ if [ -f /etc/debian_version ] ; then
osuosl173*) DEBS="$DEBS libdpkg-perl libwww-mechanize-perl sbuild"
DEBS="$DEBS live-build" # needed for live-build
DEBS="$DEBS cdebootstrap cdebootstrap-static" ;; # needed for testing just that
- # needed for opensuse openbuildservice
- osuosl174*) DEBS="$DEBS osc obs-build qemu-kvm libarchive-tools libjson-perl libxml-simple-perl" ;;
*) ;;
esac
# install stuff for bremner's builtin-pho stuff
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/0b65129f392ffb5a9661b21430cc07c97ec5ed3e...f05f9ce740989047d494bf169d1cb78417571a08
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/0b65129f392ffb5a9661b21430cc07c97ec5ed3e...f05f9ce740989047d494bf169d1cb78417571a08
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/20230214/0e7e3bb7/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list