[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible: migrate osuosl3 to bookworm
Holger Levsen (@holger)
gitlab at salsa.debian.org
Fri Mar 17 19:05:51 GMT 2023
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
95e7d077 by Holger Levsen at 2023-03-17T20:02:24+01:00
reproducible: migrate osuosl3 to bookworm
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
a9ef6c0c by Holger Levsen at 2023-03-17T20:02:24+01:00
reproducible: migrate everything from osuosl168 to osuosl3 and retire the former
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
19 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/common/etc/rc.local
- hosts/jenkins/etc/munin/munin.conf
- − hosts/osuosl168-amd64/etc/apt/apt.conf.d/80proxy
- − hosts/osuosl168-amd64/etc/apt/sources.list
- − hosts/osuosl168-amd64/etc/network/interfaces
- − hosts/osuosl168-amd64/etc/postfix/main.cf
- − hosts/osuosl168-amd64/etc/squid/squid.conf
- hosts/osuosl168-amd64/etc/apt-cacher-ng/backends_debian → hosts/osuosl3-amd64/etc/apt-cacher-ng/backends_debian
- + hosts/osuosl3-amd64/etc/apt/sources.list
- job-cfg/reproducible.yaml
- nodes/list.yml
- update_jdn.sh
Changes:
=====================================
README.infrastructure
=====================================
@@ -49,14 +49,10 @@ The nodes are used for these jobs:
* osuosl2-amd64: archlinux, alpine, coreboot, openwrt
** osuosl2 is running in the future
** the alpine jobs are disabled
-* osuosl3-amd64: Debian live-builds / Debian bootstrap jobs / debian-janitor / mmdebstrap-jenkins jobs
+* osuosl3-amd64: Debian live-builds / Debian bootstrap jobs / debian-janitor / mmdebstrap-jenkins jobs / openqa.d.n workers
* osuosl4-amd64: snapshot.r-b.o, soon not anymore, then free for other stuff
* osuosl5-amd64: to be snapshot.r-b.o
-===== legacy nodes at OSUOSL
-
-* osuosl168: openqa.d.n workers
-
=== arm64 nodes
We have 8 arm64 nodes running on moonshot hardware kindly given access to us by Codethink.
=====================================
THANKS.head
=====================================
@@ -37,12 +37,11 @@ link:https://jenkins.debian.net/["jenkins.debian.net"] would not be possible wit
** 8 cores and 64 GB memory for codethink15-arm64.debian.net used for building arm64 Debian packages for t.r-b.o, running in the future
** 8 cores and 64 GB memory for codethink16-arm64.debian.net used for building arm64 Debian packages for t.r-b.o
* link:https://letsencrypt.org[Let's encrypt] provides free of charge SSL certificates for jenkins.debian.net, reproducible.debian.net and tests.reproducible-builds.org.
- * In December 2018 we were given access to eight nodes which were donated by Facebook to the GCC Compile Farm project and are now hosted by link:https://osuosl.org/[OSUOSL]:
- ** 32 cores with 144 GB memory for osuosl168-amd64.debian.net used for openqa.d.n workers
+ * In December 2018 we were given access to eight nodes which were donated by Facebook to the GCC Compile Farm project and are now hosted by link:https://osuosl.org/[OSUOSL] which each had 32 cores with 144 GB memory. Those machines have been retired now and OSUOSL offered different machines to us:
* In spring 2023 we got access to some new nodes hosted by link:https://osuosl.org/[OSUOSL]:
** 16 cores with 125 GB memory for osuosl1-amd64.reproducible.osuosl.org used for building Arch Linux, OpenWrt, coreboot and NetBSD for t.r-b.o
** 16 cores with 125 GB memory for osuosl2-amd64.reproducible.osuosl.org used for building Arch Linux, OpenWrt, coreboot for t.r-b.o
- ** 16 cores with 125 GB memory for osuosl3-amd64.reproducible.osuosl.org used for building Debian live, Debian bootstrapping jobs, Debian janitor jobs and mmdebstrap-jenkins jobs
+ ** 16 cores with 125 GB memory for osuosl3-amd64.reproducible.osuosl.org used for building Debian live, Debian bootstrapping jobs, Debian janitor jobs, mmdebstrap-jenkins jobs and openqa.d.n workers
==== Past sponsors
=====================================
TODO
=====================================
@@ -37,11 +37,11 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
** fil would like to run 2 worker on osuosl1+3, this needs bookworm, which should be fine
** maybe run osuosl1 with a bpo kernel
** mv snapshot.r-b.o from osuosl4 to osuosl5
-** add link to OSUOSL in THANKS and explain usage
+** mention o4+5 in THANKS and explain usage
** shutdown legacy nodes at OSUOSL:
-*** osuosl168
*** already zombified, just waiting for osuosl ack:
**** osuosl167
+**** osuosl168
**** osuosl170
**** osuosl173
**** osuosl184
=====================================
bin/common-functions.sh
=====================================
@@ -233,7 +233,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|osuosl167|osuosl169|osuosl170|osuosl171|osuosl172|osuosl173|osuosl174|osuosl184fakeroot-foreign|fdroid|reproducible_.*_reproducible?$|health_check_amd64_snapshot' || 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|osuosl167|osuosl168|osuosl169|osuosl170|osuosl171|osuosl172|osuosl173|osuosl174|osuosl184fakeroot-foreign|fdroid|reproducible_.*_reproducible?$|health_check_amd64_snapshot' || true)"
if [ ! -z "$ZOMBIES" ] ; then
DIRTY=true
figlet 'zombies!!!'
=====================================
bin/jenkins_node_definitions.sh
=====================================
@@ -47,8 +47,7 @@ virt64c-armhf-rb.debian.net
wbq0-armhf-rb.debian.net
osuosl1-amd64.debian.net
osuosl2-amd64.debian.net
-osuosl3-amd64.debian.net
-osuosl168-amd64.debian.net"
+osuosl3-amd64.debian.net"
NODE_RUN_IN_THE_FUTURE=false
get_node_information() {
=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -21,10 +21,9 @@ explain_nodes() {
ionos7) write_page "<br /><small>(buildinfos.debian.net)</small>" ;;
ionos9) write_page "<br /><small>(jenkins.d.n rebootstrap jobs)</small>" ;;
ionos10) write_page "<br /><small>(jenkins.d.n chroot-installation jobs and http-proxy)</small>" ;;
- osuosl168) write_page "<br /><small>(openqa.d.n workers</small>" ;;
osuosl1) write_page "<br /><small>(r-b Alpine, Archlinux, Coreboot, NetBSD, OpenWrt builds)</small>" ;;
osuosl2) write_page "<br /><small>(r-b Alpine, Archlinux, Coreboot, OpenWrt builds)</small>" ;;
- osuosl3) write_page "<br /><small>(r-b Debian live-build / bootstrap jobs and Debian janitor jobs and mmdebstrap-jenkins jobs)</small>" ;;
+ osuosl3) write_page "<br /><small>(r-b Debian live-build / bootstrap jobs and Debian janitor jobs, mmdebstrap-jenkins jobs and openqa.d.n workers</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
=====================================
@@ -139,7 +139,6 @@ elif [ "$1" = "jenkins" ] || [ "$1" = "only" ] ; then
o3) HOSTS+=(osuosl3-amd64.debian.net) ;;
o4) HOSTS+=(osuosl4-amd64.debian.net) ;;
o5) HOSTS+=(osuosl5-amd64.debian.net) ;;
- o168) HOSTS+=(osuosl168-amd64.debian.net) ;;
c9|cs9|ct9) HOSTS+=(codethink9-arm64.debian.net) ;;
c10|cs10|ct10) HOSTS+=(codethink10-arm64.debian.net) ;;
c11|cs11|ct11) HOSTS+=(codethink11-arm64.debian.net) ;;
=====================================
hosts/common/etc/rc.local
=====================================
@@ -72,7 +72,6 @@ iptables -I INPUT -p udp --dport 111 -j DROP
# put schroots on tmpfs for non debian hosts
#
case $(hostname) in
- osuosl168*) put_schroots_on_tmpfs ;;
osuosl1-amd64) put_schroots_on_tmpfs ;;
osuosl2-amd64) put_schroots_on_tmpfs ;;
osuosl3-amd64) put_schroots_on_tmpfs ;;
=====================================
hosts/jenkins/etc/munin/munin.conf
=====================================
@@ -550,16 +550,6 @@ contact.me.command mail -s "Munin notification ${var:host}" root
address osuosl5-amd64.debian.net
use_node_name yes
-[osuosl168-amd64.debian.net]
- address ssh://jenkins@osuosl168-amd64.debian.net:45047/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
@@ -612,7 +602,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 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
+ 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 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
=====================================
hosts/osuosl168-amd64/etc/apt/apt.conf.d/80proxy deleted
=====================================
@@ -1 +0,0 @@
-Acquire::http::Proxy "http://127.0.0.1:3128";
=====================================
hosts/osuosl168-amd64/etc/apt/sources.list deleted
=====================================
@@ -1,13 +0,0 @@
-deb http://deb.debian.org/debian/ bookworm main contrib non-free non-free-firmware
-#deb-src http://deb.debian.org/debian/ bookworm main contrib non-free non-free-firmware
-
-deb http://deb.debian.org/debian/ bookworm-updates main contrib non-free non-free-firmware
-#deb-src http://deb.debian.org/debian/ bookworm-updates main contrib non-free non-free-firmware
-
-deb http://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware
-#deb-src http://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware
-
-#deb http://deb.debian.org/debian/ bookworm-backports main contrib non-free non-free-firmware
-#deb-src http://deb.debian.org/debian/ bookworm-backports main contrib non-free non-free-firmware
-
-#deb https://fasttrack.debian.net/debian/ bookworm-fasttrack main contrib non-free non-free-firmware
=====================================
hosts/osuosl168-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.47
- netmask 255.255.252.0
- gateway 10.6.4.1
-
=====================================
hosts/osuosl168-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 = osuosl168-amd64.debian.net
-alias_maps = hash:/etc/aliases
-alias_database = hash:/etc/aliases
-myorigin = /etc/mailname
-mydestination = osuosl168-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/osuosl168-amd64/etc/squid/squid.conf deleted
=====================================
The diff for this file was not included because it is too large.
=====================================
hosts/osuosl168-amd64/etc/apt-cacher-ng/backends_debian → hosts/osuosl3-amd64/etc/apt-cacher-ng/backends_debian
=====================================
=====================================
hosts/osuosl3-amd64/etc/apt/sources.list
=====================================
@@ -0,0 +1,23 @@
+#
+# Debian bookworm
+#
+deb http://deb.debian.org/debian/ bookworm main non-free-firmware contrib non-free
+#deb-src http://deb.debian.org/debian/ bookworm main non-free-firmware contrib non-free
+
+#
+# Debian bookworm security
+#
+deb http://security.debian.org/ bookworm-security main non-free-firmware contrib non-free
+#deb-src http://security.debian.org/ bookworm-security main non-free-firmware contrib non-free
+
+#
+# Debian bookworm updates
+#
+deb http://deb.debian.org/debian/ bookworm-updates main non-free-firmware contrib non-free
+#deb-src http://deb.debian.org/debian/ bookworm-updates main non-free-firmware contrib non-free
+
+#
+# Debian bookworm-backports
+#
+deb http://deb.debian.org/debian/ bookworm-backports main non-free-firmware contrib non-free
+#deb-src http://deb.debian.org/debian/ bookworm-backports main non-free-firmware contrib non-free
=====================================
job-cfg/reproducible.yaml
=====================================
@@ -363,7 +363,6 @@
- 'osuosl3': { my_arch: 'amd64' }
- 'osuosl4': { my_arch: 'amd64' }
- 'osuosl5': { my_arch: 'amd64' }
- - 'osuosl168': { my_arch: 'amd64' }
- 'codethink9': { my_arch: 'arm64' }
- 'codethink10': { my_arch: 'arm64' }
- 'codethink11': { my_arch: 'arm64' }
@@ -413,7 +412,6 @@
- 'osuosl3': { my_arch: 'amd64' }
- 'osuosl4': { my_arch: 'amd64' }
- 'osuosl5': { my_arch: 'amd64' }
- - 'osuosl168': { my_arch: 'amd64' }
- 'codethink9': { my_arch: 'arm64' }
- 'codethink10': { my_arch: 'arm64' }
- 'codethink11': { my_arch: 'arm64' }
=====================================
nodes/list.yml
=====================================
@@ -90,11 +90,6 @@
port: 22
keys:
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiUrNLoKkXeeq1x492sfaEnzKfRP790tVpYNMtRYvSv root at osuosl5-amd64
-- hostname: osuosl168-amd64.debian.net
- ip: 128.193.126.200
- port: 45047
- keys:
- - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKW0YYo21NiN6dzM0Rnu+XCu13NEgZOPsKo50gJJF/HJ root at gcc168
# arm64
- hostname: codethink9-arm64.debian.net
=====================================
update_jdn.sh
=====================================
@@ -128,15 +128,15 @@ user_host_groups['lynxis','jenkins']="jenkins"
user_host_groups['kpcyrd','osuosl1-amd64']="$sudo_groups"
user_host_groups['kpcyrd','osuosl2-amd64']="$sudo_groups"
user_host_groups['kpcyrd','jenkins']="jenkins"
-user_host_groups['bubu','osuosl168-amd64']="$sudo_groups"
-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['bubu','osuosl3-amd64']="$sudo_groups"
+#user_host_groups['hans','osuosl3-amd64']="$sudo_groups"
+#user_host_groups['flx','osuosl3-amd64']="$sudo_groups"
+#user_host_groups['jspricke','osuosl3-amd64']="$sudo_groups"
user_host_groups['vagrant','*']="$sudo_groups"
user_host_groups['santiago','ionos3-amd64']="$sudo_groups"
user_host_groups['fpierret','osuosl4-amd']="$sudo_groups"
user_host_groups['rclobus','osuosl3-amd64']="$sudo_groups"
-user_host_groups['phil','osuosl168-amd64']="$sudo_groups"
+user_host_groups['phil','osuosl3-amd64']="$sudo_groups"
user_host_groups['bernhard','xxxxx']="$sudo_groups"
u_shell['mattia']='/bin/zsh'
@@ -367,7 +367,7 @@ if [ -f /etc/debian_version ] ; then
linux-image-generic
monitoring-plugins-contrib/buster-backports
" ;;
- osuosl168*) # is running Debian bookworm already
+ osuosl3*) # is running Debian bookworm already
DEBS="$DEBS
btop
fasttrack-archive-keyring
@@ -484,7 +484,7 @@ if [ -f /etc/debian_version ] ; then
*) ;;
esac
case $HOSTNAME in
- osuosl168-amd64)
+ osuosl3-amd64)
DEBS="$DEBS
openqa-worker
apt-cacher-ng
@@ -838,7 +838,7 @@ fi
#
# generate the kgb-client configurations
#
-if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "osuosl168-amd64" ] || [ "$HOSTNAME" = "osuosl1-amd64" ] || [ "$HOSTNAME" = "osuosl2-amd64" ] || [ "$HOSTNAME" = "ionos2-i386" ] || [ "$HOSTNAME" = "ionos12-i386" ] ; then
+if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "osuosl1-amd64" ] || [ "$HOSTNAME" = "osuosl2-amd64" ] || [ "$HOSTNAME" = "osuosl3-amd64" ] || [ "$HOSTNAME" = "ionos2-i386" ] || [ "$HOSTNAME" = "ionos12-i386" ] ; then
cd $BASEDIR
KGB_SECRETS="/srv/jenkins/kgb/secrets.yml"
if [ -f "$KGB_SECRETS" ] && [ $(stat -c "%a:%U:%G" "$KGB_SECRETS") = "640:jenkins-adm:jenkins-adm" ] ; then
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/a8815d1c950018a76336fc604421b8915190a904...a9ef6c0c2c9865d55eb6c3f9b594f4b58d63b3e7
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/a8815d1c950018a76336fc604421b8915190a904...a9ef6c0c2c9865d55eb6c3f9b594f4b58d63b3e7
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/71453b5d/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list