[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: follow the DNS rename of the new nodes
Holger Levsen (@holger)
gitlab at salsa.debian.org
Thu Feb 16 12:01:16 GMT 2023
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
f9f9c65d by Holger Levsen at 2023-02-16T13:00:06+01:00
reproducible: follow the DNS rename of the new nodes
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
4 changed files:
- bin/common-functions.sh
- hosts/jenkins/etc/munin/munin.conf
- job-cfg/reproducible.yaml
- nodes/list.yml
Changes:
=====================================
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|osuosl174|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|reproducible_.*_reproducible?$' || true)"
if [ ! -z "$ZOMBIES" ] ; then
DIRTY=true
figlet 'zombies!!!'
=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -530,16 +530,16 @@ contact.me.command mail -s "Munin notification ${var:host}" root
diskstats_utilization.graph no
diskstats_iops.graph no
-[debian.net;reproducible1-amd64.osuosl.org]
- address reproducible1-amd64.osuosl.org
+[debian.net;osuosl1-amd64.reproducible.osuosl.org]
+ address osuosl1-amd64.reproducible.osuosl.org
use_node_name yes
-[debian.net;reproducible2-amd64.osuosl.org]
- address reproducible2-amd64.osuosl.org
+[debian.net;osuosl2-amd64.reproducible.osuosl.org]
+ address osuosl2-amd64.reproducible.osuosl.org
use_node_name yes
-[debian.net;reproducible3-amd64.osuosl.org]
- address reproducible3-amd64.osuosl.org
+[debian.net;osuosl2-amd64.reproducible.osuosl.org]
+ address osuosl2-amd64.reproducible.osuosl.org
use_node_name yes
[osuosl167-amd64.debian.net]
@@ -663,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 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 osuosl1-amd64.reproducible.osuosl.org osuosl2-amd64.reproducible.osuosl.org osuosl3-amd64.reproducible.osuosl.org
[reproducible-builds.org;]
node_order rb-mail1.reproducible-builds.org snapshot.reproducible-builds.org
=====================================
job-cfg/reproducible.yaml
=====================================
@@ -358,6 +358,9 @@
- 'ionos12': { my_arch: 'i386' }
- 'ionos15': { my_arch: 'amd64' }
- 'ionos16': { my_arch: 'i386' }
+ - 'osuosl1': { my_arch: 'amd64' }
+ - 'osuosl2': { my_arch: 'amd64' }
+ - 'osuosl3': { my_arch: 'amd64' }
- 'osuosl167': { my_arch: 'amd64' }
- 'osuosl168': { my_arch: 'amd64' }
- 'osuosl184': { my_arch: 'amd64' }
@@ -365,9 +368,6 @@
- 'osuosl171': { my_arch: 'amd64' }
- 'osuosl172': { my_arch: 'amd64' }
- 'osuosl173': { my_arch: 'amd64' }
- - 'reproducible1': { my_arch: 'amd64' }
- - 'reproducible2': { my_arch: 'amd64' }
- - 'reproducible3': { my_arch: 'amd64' }
- 'codethink9': { my_arch: 'arm64' }
- 'codethink10': { my_arch: 'arm64' }
- 'codethink11': { my_arch: 'arm64' }
@@ -412,6 +412,9 @@
- 'ionos12': { my_arch: 'i386' }
- 'ionos15': { my_arch: 'amd64' }
- 'ionos16': { my_arch: 'i386' }
+ - 'osuosl1': { my_arch: 'amd64' }
+ - 'osuosl2': { my_arch: 'amd64' }
+ - 'osuosl3': { my_arch: 'amd64' }
- 'osuosl167': { my_arch: 'amd64' }
- 'osuosl168': { my_arch: 'amd64' }
- 'osuosl184': { my_arch: 'amd64' }
@@ -419,9 +422,6 @@
- 'osuosl171': { my_arch: 'amd64' }
- 'osuosl172': { my_arch: 'amd64' }
- 'osuosl173': { my_arch: 'amd64' }
- - 'reproducible1': { my_arch: 'amd64' }
- - 'reproducible2': { my_arch: 'amd64' }
- - 'reproducible3': { my_arch: 'amd64' }
- 'snapshot': { my_arch: 'amd64' }
- 'codethink9': { my_arch: 'arm64' }
- 'codethink10': { my_arch: 'arm64' }
=====================================
nodes/list.yml
=====================================
@@ -65,17 +65,17 @@
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIClWngqx6K8OYWxtWUZ0Wa463A5iAlwi+gaEI+opDvjV root at rb-mail1
# x86 osuosl
-- hostname: reproducible1-amd64.osuosl.org
+- hostname: osuosl1-amd64.reproducible.osuosl.org
ip: 140.211.9.209
port: 22
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJD2br9vADl3wVAAAzUQK6O3qudaAYI00FQ1cv/wdtSQ root at reproducible1
-- hostname: reproducible2-amd64.osuosl.org
+- hostname: osuosl2-amd64.reproducible.osuosl.org
ip: 140.211.9.210
port: 22
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINsu6DXrKHUHdAx4flpS4Y/i4rOP8+lzI0Kyp6pscv5K root at reproducible2
-- hostname: reproducible3-amd64.osuosl.org
+- hostname: osuosl3-amd64.reproducible.osuosl.org
ip: 140.211.9.211
port: 22
keys:
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/f9f9c65d5663f96220aaba72efbf7e12ace7c592
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/f9f9c65d5663f96220aaba72efbf7e12ace7c592
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/20230216/b2a68259/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list