[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: use .debian.net names everywhere, except when communicating with the outside world
Holger Levsen (@holger)
gitlab at salsa.debian.org
Fri Mar 17 15:38:08 GMT 2023
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
e3df5ea5 by Holger Levsen at 2023-03-17T16:27:59+01:00
reproducible: use .debian.net names everywhere, except when communicating with the outside world
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
7 changed files:
- README.snapshot.r-b.o
- bin/jenkins_node_definitions.sh
- bin/reproducible_html_rsync_remote_results.sh
- bin/reproducible_openwrt.sh
- deploy_jdn
- hosts/jenkins/etc/munin/munin.conf
- nodes/list.yml
Changes:
=====================================
README.snapshot.r-b.o
=====================================
@@ -15,8 +15,8 @@ hosted at OSUOSL.org
=== initial setup
-snapshot.r-b.o is osuosl4-amd64.reproducible.osuosl.org, to be moved to
-osuosl5-amd64.reproducible.osuosl.org.
+snapshot.r-b.o is osuosl4-amd64.debian.net, to be moved to
+osuosl5-amd64.debian.net.
I followed https://github.com/fepitre/debian-snapshot#installation and
added the needed packages to update_jdn.sh in this git repo.
=====================================
bin/jenkins_node_definitions.sh
=====================================
@@ -45,9 +45,9 @@ virt64a-armhf-rb.debian.net
virt64b-armhf-rb.debian.net
virt64c-armhf-rb.debian.net
wbq0-armhf-rb.debian.net
-osuosl1-amd64.reproducible.osuosl.org
-osuosl2-amd64.reproducible.osuosl.org
-osuosl3-amd64.reproducible.osuosl.org
+osuosl1-amd64.debian.net
+osuosl2-amd64.debian.net
+osuosl3-amd64.debian.net
osuosl167-amd64.debian.net
osuosl168-amd64.debian.net"
=====================================
bin/reproducible_html_rsync_remote_results.sh
=====================================
@@ -44,6 +44,6 @@ rsync_remote_results() {
# main
echo "$(date -u) - Starting to rsync results."
-rsync_remote_results coreboot osuosl1-amd64.reproducible.osuosl.org
-rsync_remote_results netbsd osuosl1-amd64.reproducible.osuosl.org
+rsync_remote_results coreboot osuosl1-amd64.debian.net
+rsync_remote_results netbsd osuosl1-amd64.debian.net
echo "$(date -u) - the end."
=====================================
bin/reproducible_openwrt.sh
=====================================
@@ -26,9 +26,9 @@ OPENWRT_TARGET=
OPENWRT_HOST_PACKAGES="gcc gcc-multilib binutils bzip2 flex python3 perl make findutils grep diffutils unzip gawk util-linux zlib1g-dev libc6-dev git subversion"
# node configuration
-GENERIC_NODE1=osuosl1-amd64.reproducible.osuosl.org
+GENERIC_NODE1=osuosl1-amd64.debian.net
get_node_information $GENERIC_NODE1
-GENERIC_NODE2=osuosl2-amd64.reproducible.osuosl.org
+GENERIC_NODE2=osuosl2-amd64.debian.net
get_node_information $GENERIC_NODE2
SSHN1="ssh $GENERIC_NODE1"
SSHN2="ssh $GENERIC_NODE2"
=====================================
deploy_jdn
=====================================
@@ -134,11 +134,11 @@ elif [ "$1" = "jenkins" ] || [ "$1" = "only" ] ; then
12|i12|ionos12) HOSTS+=(ionos12-i386.debian.net) ;;
15|i15|ionos15) HOSTS+=(ionos15-amd64.debian.net) ;;
16|i16|ionos16) HOSTS+=(ionos16-i386.debian.net) ;;
- o1) HOSTS+=(osuosl1-amd64.reproducible.osuosl.org) ;;
- o2) HOSTS+=(osuosl2-amd64.reproducible.osuosl.org) ;;
- o3) HOSTS+=(osuosl3-amd64.reproducible.osuosl.org) ;;
- o4) HOSTS+=(osuosl4-amd64.reproducible.osuosl.org) ;;
- o5) HOSTS+=(osuosl5-amd64.reproducible.osuosl.org) ;;
+ o1) HOSTS+=(osuosl1-amd64.debian.net) ;;
+ o2) HOSTS+=(osuosl2-amd64.debian.net) ;;
+ o3) HOSTS+=(osuosl3-amd64.debian.net) ;;
+ o4) HOSTS+=(osuosl4-amd64.debian.net) ;;
+ o5) HOSTS+=(osuosl5-amd64.debian.net) ;;
o167) HOSTS+=(osuosl167-amd64.debian.net) ;;
o168) HOSTS+=(osuosl168-amd64.debian.net) ;;
c9|cs9|ct9) HOSTS+=(codethink9-arm64.debian.net) ;;
=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -530,24 +530,24 @@ contact.me.command mail -s "Munin notification ${var:host}" root
diskstats_utilization.graph no
diskstats_iops.graph no
-[debian.net;osuosl1-amd64.reproducible.osuosl.org]
- address osuosl1-amd64.reproducible.osuosl.org
+[debian.net;osuosl1-amd64.debian.net]
+ address osuosl1-amd64.debian.net
use_node_name yes
-[debian.net;osuosl2-amd64.reproducible.osuosl.org]
- address osuosl2-amd64.reproducible.osuosl.org
+[debian.net;osuosl2-amd64.debian.net]
+ address osuosl2-amd64.debian.net
use_node_name yes
-[debian.net;osuosl3-amd64.reproducible.osuosl.org]
- address osuosl3-amd64.reproducible.osuosl.org
+[debian.net;osuosl3-amd64.debian.net]
+ address osuosl3-amd64.debian.net
use_node_name yes
-[debian.net;osuosl4-amd64.reproducible.osuosl.org]
- address osuosl4-amd64.reproducible.osuosl.org
+[debian.net;osuosl4-amd64.debian.net]
+ address osuosl4-amd64.debian.net
use_node_name yes
-[debian.net;osuosl5-amd64.reproducible.osuosl.org]
- address osuosl5-amd64.reproducible.osuosl.org
+[debian.net;osuosl5-amd64.debian.net]
+ address osuosl5-amd64.debian.net
use_node_name yes
[osuosl167-amd64.debian.net]
@@ -618,7 +618,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 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 osuosl4-amd64.reproducible.osuosl.org osuosl5-amd64.reproducible.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 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.debian.net osuosl2-amd64.debian.net osuosl3-amd64.debian.net osuosl4-amd64.debian.net osuosl5-amd64.debian.net
[reproducible-builds.org;]
node_order rb-mail1.reproducible-builds.org
=====================================
nodes/list.yml
=====================================
@@ -65,27 +65,27 @@
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIClWngqx6K8OYWxtWUZ0Wa463A5iAlwi+gaEI+opDvjV root at rb-mail1
# x86 osuosl
-- hostname: osuosl1-amd64.reproducible.osuosl.org
+- hostname: osuosl1-amd64.debian.net
ip: 140.211.9.209
port: 22
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJD2br9vADl3wVAAAzUQK6O3qudaAYI00FQ1cv/wdtSQ root at osuosl1-amd64
-- hostname: osuosl2-amd64.reproducible.osuosl.org
+- hostname: osuosl2-amd64.debian.net
ip: 140.211.9.210
port: 22
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINsu6DXrKHUHdAx4flpS4Y/i4rOP8+lzI0Kyp6pscv5K root at osuosl2-amd64
-- hostname: osuosl3-amd64.reproducible.osuosl.org
+- hostname: osuosl3-amd64.debian.net
ip: 140.211.9.211
port: 22
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMe7sAL+XwHV+C1xS2pEsB6vrvIa5z1/FBL5SbMkhkLK root at osuosl3-amd64
-- hostname: osuosl4-amd64.reproducible.osuosl.org
+- hostname: osuosl4-amd64.debian.net
ip: 140.211.9.159
port: 22
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEyLOqDn5KZGK3KuMseH7LTvHLKnK6cVZbUwvX5IQyU8 root at osuosl4-amd64
-- hostname: osuosl5-amd64.reproducible.osuosl.org
+- hostname: osuosl5-amd64.debian.net
ip: 140.211.9.223
port: 22
keys:
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/e3df5ea5dc8c07e2865f502e898e3ba8afaaee78
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/e3df5ea5dc8c07e2865f502e898e3ba8afaaee78
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/20230317/577cd88c/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list