[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible Debian: add two new nodes at OSUOSL, old and new snapshot server
Holger Levsen (@holger)
gitlab at salsa.debian.org
Mon Mar 13 17:57:22 GMT 2023
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
627e56fa by Holger Levsen at 2023-03-13T18:49:01+01:00
reproducible Debian: add two new nodes at OSUOSL, old and new snapshot server
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
4 changed files:
- bin/common-functions.sh
- hosts/jenkins/etc/munin/munin.conf
- nodes/list.yml
- update_jdn.sh
Changes:
=====================================
bin/common-functions.sh
=====================================
@@ -112,7 +112,7 @@ else
if [ "${MIRROR+x}" != "x" ] ; then
case $HOSTNAME in
- jenkins|ionos*|osuosl*|snapshot|reproducible*)
+ jenkins|ionos*|osuosl*)
export MIRROR=http://cdn-fastly.deb.debian.org/debian ;;
cbxi4*|wbq0|ff*|jt?1*|virt32[a-z]|virt64[a-z])
export MIRROR=http://cdn-fastly.deb.debian.org/debian ;;
@@ -141,7 +141,6 @@ else
export http_proxy="http://10.0.0.15:3142/" ;;
spectrum)
export http_proxy="http://127.0.0.1:3128" ;;
- snapshot|reproducible*) : ;;
warren) : ;; # warren is mattia's laptop
*)
echo "unsupported host, exiting." ; exit 1 ;;
=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -542,6 +542,14 @@ contact.me.command mail -s "Munin notification ${var:host}" root
address osuosl3-amd64.reproducible.osuosl.org
use_node_name yes
+[debian.net;osuosl4-amd64.reproducible.osuosl.org]
+ address osuosl4-amd64.reproducible.osuosl.org
+ use_node_name yes
+
+[debian.net;osuosl5-amd64.reproducible.osuosl.org]
+ address osuosl5-amd64.reproducible.osuosl.org
+ use_node_name yes
+
[osuosl167-amd64.debian.net]
address ssh://jenkins@osuosl167-amd64.debian.net:45046/bin/nc localhost 4949
use_node_name yes
@@ -619,9 +627,6 @@ contact.me.command mail -s "Munin notification ${var:host}" root
[rb-mail1.reproducible-builds.org]
address rb-mail1.reproducible-builds.org
-[snapshot.reproducible-builds.org]
- address snapshot.reproducible-builds.org
-
#
# A more complex example of a host tree
#
@@ -663,8 +668,8 @@ 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 osuosl1-amd64.reproducible.osuosl.org osuosl2-amd64.reproducible.osuosl.org osuosl3-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 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 osuosl4-amd64.reproducible.osuosl.org osuosl5-amd64.reproducible.osuosl.org
[reproducible-builds.org;]
- node_order rb-mail1.reproducible-builds.org snapshot.reproducible-builds.org
+ node_order rb-mail1.reproducible-builds.org
=====================================
nodes/list.yml
=====================================
@@ -80,6 +80,16 @@
port: 22
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMe7sAL+XwHV+C1xS2pEsB6vrvIa5z1/FBL5SbMkhkLK root at reproducible3
+- hostname: osuosl4-amd64.reproducible.osuosl.org
+ ip: 140.211.9.159
+ port: 22
+ keys:
+ - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEyLOqDn5KZGK3KuMseH7LTvHLKnK6cVZbUwvX5IQyU8 root at snapshot
+- hostname: osuosl5-amd64.reproducible.osuosl.org
+ ip: 140.211.9.223
+ port: 22
+ keys:
+ - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiUrNLoKkXeeq1x492sfaEnzKfRP790tVpYNMtRYvSv root at osuosl5-amd64
- hostname: osuosl167-amd64.debian.net
ip: 128.193.126.200
port: 45046
@@ -115,11 +125,6 @@
port: 45077
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7lJqrRukYSvh9LFCkWvrhNc9/7WDdnXPBW6/AJftBg root at gcc184
-- hostname: snapshot.reproducible-builds.org
- ip: 140.211.9.159
- port: 22
- keys:
- - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEyLOqDn5KZGK3KuMseH7LTvHLKnK6cVZbUwvX5IQyU8 root at snapshot
# arm64
- hostname: codethink9-arm64.debian.net
=====================================
update_jdn.sh
=====================================
@@ -134,7 +134,7 @@ 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['santiago','ionos3-amd64']="$sudo_groups"
-user_host_groups['fpierret','snapshot']="$sudo_groups"
+user_host_groups['fpierret','osuosl4-amd']="$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"
@@ -493,27 +493,27 @@ if [ -f /etc/debian_version ] ; then
DEBS="$DEBS ffmpeg python3-popcon dose-extra"
;;
esac
- # packages needed for snapshot.reproducible-builds.org
+ # packages needed for snapshot.reproducible-builds.org (on osuosl4-amd64 and osuosl5, as we migrate from the former to the later)
case $HOSTNAME in
- snapshot*) DEBS="$DEBS
- nginx-full
- postgresql-13
- postgresql-plpython3-13
- python3-dateutil
- python3-debian
- python3-flask
- python3-flask-caching
- python3-flask-sqlalchemy
- python3-httpx
- python3-psycopg2
- python3-sqlalchemy
- python3-sqlalchemy
- python3-tenacity
- uwsgi
- uwsgi-plugin-python3
- xfsprogs
- " ;;
- *) ;;
+ osuosl4*|osuosl5*) DEBS="$DEBS
+ nginx-full
+ postgresql-13
+ postgresql-plpython3-13
+ python3-dateutil
+ python3-debian
+ python3-flask
+ python3-flask-caching
+ python3-flask-sqlalchemy
+ python3-httpx
+ python3-psycopg2
+ python3-sqlalchemy
+ python3-sqlalchemy
+ python3-tenacity
+ uwsgi
+ uwsgi-plugin-python3
+ xfsprogs
+ " ;;
+ *) ;;
esac
# mock is needed to build fedora
#if [ "$HOSTNAME" = "osuosl171-amd64" ] || [ "$HOSTNAME" = "osuosl172-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/627e56fa3bd73e478ff04fef1eb5b4a43603c1bd
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/627e56fa3bd73e478ff04fef1eb5b4a43603c1bd
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/20230313/78a2d94b/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list