[Git][qa/jenkins.debian.net][master] jenkins nodes: drop i386 almost everywhere, except t.r-b.o/debian webpages for now
Holger Levsen (@holger)
gitlab at salsa.debian.org
Wed May 21 12:22:44 BST 2025
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
92a1f3ca by Holger Levsen at 2025-05-21T13:22:28+02:00
jenkins nodes: drop i386 almost everywhere, except t.r-b.o/debian webpages for now
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
21 changed files:
- README
- README.development
- README.infrastructure
- THANKS.head
- TODO.infrastructure
- TODO.legacy
- TODO.trixie
- bin/djm
- bin/jenkins_node_definitions.sh
- bin/reproducible_blacklist.sh
- bin/reproducible_build.sh
- bin/reproducible_html_nodes_info.sh
- bin/reproducible_maintenance.sh
- bin/reproducible_system_health.sh
- hosts/common/etc/pbuilderrc
- − hosts/ionos12-i386/etc/apt/apt.conf.d/80proxy
- − hosts/ionos16-i386/etc/apt/apt.conf.d/80proxy
- − hosts/ionos2-i386/etc/apt/apt.conf.d/80proxy
- − hosts/ionos6-i386/etc/apt/apt.conf.d/80proxy
- jenkins-home/offline_nodes
- update_jdn.sh
Changes:
=====================================
README
=====================================
@@ -118,13 +118,12 @@ Installation tests inside chroot environments.
* The (current) purpose of https://tests.reproducible-builds.org is to show the potential of reproducible builds for Debian - and six other projects currently. This is research, showing what could (and should) be done... check https://wiki.debian.org/ReproducibleBuilds for the real status of the project for Debian!
-* For Debian, six suites, 'buster', 'bullseye', 'bookworm', 'trixie', 'unstable' and 'experimental', are tested on four architectures: 'amd64', 'i386', 'arm64' and 'armhf'. The tests are done using 'pbuilder' through several concurrent workers: 40 for 'amd64', 24 for 'i386', 32 for 'arm64' and 35 for 'armhf', which are each constantly testing packages and saving the results of these tests. There's a single link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_build_service.sh[systemd service] starting all of these link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_worker.sh[workers] which in turn launch the actual link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_build.sh[build script]. (So the actual builds and tests are happening outside the jenkins service.)
+* For Debian, six suites, 'buster', 'bullseye', 'bookworm', 'trixie', 'unstable' and 'experimental', are tested on three architectures: 'amd64', 'arm64' and 'armhf'. The tests are done using 'pbuilder' through several concurrent workers: 40 for 'amd64', 32 for 'arm64' and 35 for 'armhf', which are each constantly testing packages and saving the results of these tests. There's a single link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_build_service.sh[systemd service] starting all of these link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_worker.sh[workers] which in turn launch the actual link:https://salsa.debian.org/qa/jenkins.debian.net/blob/master/bin/reproducible_build.sh[build script]. (So the actual builds and tests are happening outside the jenkins service.)
** To shutdown all the workers use: `sudo systemctl stop reproducible_build && sudo systemctl --user -M jenkins@ stop reproducible-build at .service && /srv/jenkins/bin/reproducible_cleanup_nodes.sh`
** To start all the workers use: `sudo systemctl start reproducible_build`
* These builds on remote nodes run on very different hardware:
** for 'amd64' we are using four virtual machines, ionos(1+5+11+15)-amd64, which have 15 or 16 cores and 48gb ram each. These nodes are sponsored by link:https://jenkins.debian.net/userContent/thanks.html[IONOS].
-** for 'i386' we are also using four virtual machines, ionos(2+6+12+16)-i386, which have 10 or 9 cores and 36gb ram each. ionos2+12 run emulated AMD Opteron CPUs and ionos6+16 Intel Xeon CPUs. These nodes are also sponsored by link:https://jenkins.debian.net/userContent/thanks.html[IONOS].
** for 'arm64' we are using eight arm64 kvm nodes, which have 12 cores and 32gb ram each. These nodes are sponsored by link:https://jenkins.debian.net/userContent/thanks.html[Codethink].
** To test 'armhf' we are using 15 small boards hosted by vagrant at reproducible-builds.org:
*** two quad-cores (cbxi4pro0, wbq0) with 2gb ram,
=====================================
README.development
=====================================
@@ -75,7 +75,7 @@ All webpages will be served out of /var/lib/jenkins/userContent/reproducible and
Before running, create the following directories and files:
----
sudo mkdir /srv/reproducible-results/node-information/
-for i in i386 amd64 arm64 armhf ; do touch /srv/reproducible-results/node-information/dummy_$i ; done
+for i in amd64 arm64 armhf ; do touch /srv/reproducible-results/node-information/dummy_$i ; done
----
And run the following script as user jenkins:
=====================================
README.infrastructure
=====================================
@@ -28,9 +28,9 @@ https://tests.reproducible-builds.org/trbo.status.html as well as lacks some
other, so it is advised to monitor both the shell script as well as that URL
- and act on it.
-=== amd64 and i386 nodes at IONOS.com
+=== amd64 nodes at IONOS.com
-amd64 and i386 nodes run as VMs in the IONOS cloud. Mattia and Holger have "physical"
+amd64 nodes run as VMs in the IONOS cloud. Mattia and Holger have "physical"
access including remote console and BIOS access.
The VMs for jenkins.d.n and rb-mail1.r-b.o have a statically allocated IP addresses, as well
@@ -54,7 +54,7 @@ The nodes are used for these jobs:
* osuosl4-amd64: manual debugging by vagrant and others, future rebuilderd worker
* osuosl5-amd64: rebuilderd main node & four workers, see https://reproduce.debian.net
-==== amd64 and i386 nodes at infomaniak.cloud
+==== amd64 nodes at infomaniak.cloud
* infom01-amd64, doing Debian r-b CI builds
* infom02-amd64, doing Debian r-b CI builds, running in the future
=====================================
THANKS.head
=====================================
@@ -7,27 +7,24 @@ Many many thanks to our sponsors and contributors! Without you, jenkins.debian.n
link:https://jenkins.debian.net/["jenkins.debian.net"] would not be possible without our sponsors:
* Since October *2012* jenkins.debian.net has been running on (virtualized) hardware sponsored by link:https://www.ionos.com[IONOS] (formerly known as Profitbricks) - *<blink>Thank you very very very much!</blink>*!
- * Currently the vast majority of our 'amd64' and 'i386' nodes are hosted there:
+ * Currently the vast majority of our 'amd64' nodes are hosted there:
** 32 cores and 160 GB memory for jenkins.debian.net
** 20 cores and 80 GB memory for ionos1-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o)
- ** 13 cores and 8 GB memory for ionos2-i386.debian.net used for building i386 Debian packages for t.r-b.o
** 21 cores and 80 GB memory for ionos5-amd64.debian.net used for building amd64 Debian packages for t.r-b.o, running in the future
- ** 12 cores and 8 GB memory for ionos6-i386.debian.net used for building i386 Debian packages for t.r-b.o, running in the future
** 20 cores and 80 GB memory for ionos11-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o)
- ** 13 cores and 8 GB memory for ionos12-i386.debian.net used for building i386 Debian packages for t.r-b.o
** 21 cores and 80 GB memory for ionos15-amd64.debian.net used for building amd64 Debian packages for t.r-b.o, running in the future
- ** 12 cores and 8 GB memory for ionos16-i386.debian.net sed for building i386 Debian packages for t.r-b.o, running in the future
** 2 cores and 8 GB memory for ionos7-amd64.debian.net used for buildinfos.debian.net
** 5 cores and 10 GB memory for ionos9-amd64.debian.net used for rebootstrap jobs
** 4 cores and 12 GB memory for ionos10-amd64.debian.net used for chroot-installation jobs
** 9 cores and 19 GB memory for freebsd-jenkins.debian.net (also running on IONOS virtual hardware), used for building FreeBSD for t.r-b.o
** 2 cores and 12 GB memory for ionos4-amd64.debian.net used as a http(s)-proxy for one half of our ionos nodes
** 2 cores and 12 GB memory for ionos14-amd64.debian.net used as a http(s)-proxy for the other half of our ionos nodes
+ ** in the past, we also have run i386 nodes at link:https://www.ionos.com[IONOS].
* link:https://www.infomaniak.com/en/hosting/public-cloud[infomaniak's public cloud] also provides us with two 'amd64' nodes:
** 12 cores and 24 GB memory for infom01-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o)
** 12 cores and 24 GB memory for infom02-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o), running in the future
- ** 8 cores and 16 GB memory for infom01-i386.debian.net used for building i386 Debian packages for tests.reproducible-builds.org (t.r-b.o)
- ** 8 cores and 16 GB memory for infom02-i386.debian.net used for building i386 Debian packages for tests.reproducible-builds.org (t.r-b.o), running in the future
+ ** 8 cores and 16 GB memory for infom01-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o)
+ ** 8 cores and 16 GB memory for infom02-amd64.debian.net used for building amd64 Debian packages for tests.reproducible-builds.org (t.r-b.o), running in the future
* link:https://qa.debian.org/developer.php?login=vagrant%40debian.org[Vagrant] provides and hosts 13 'armhf' systems, used for building armhf Debian packages for t.r-b.o:
** four quad-cores with 4 GB RAM each,
** 'armhf' servers provided by linaro, hosted at Varant:
=====================================
TODO.infrastructure
=====================================
@@ -16,7 +16,6 @@ free sdd space: ~0 GB
ordered todo
------------
-ionos*i386: increase ram to 16gb but dont increase workers yet
infom08
remove debian (uid 1000) user (also on 01+02)
djm:
@@ -25,7 +24,7 @@ djm:
amd64 is now often build (i1+5+11+16, but not infom1+2) with cpu variation: once intel, once amd
turn SSD based swap on ionos1+5+11+15 into hdd based one
check /srv/workspace (tmpfs or not) on all ionos nodes and all nodes in general
- also, our pbuilderc is setup to only use eatmydata on armhf+i386 - because amd64+arm64 build on tmpfs anyway (which is not true anymore...)
+ also, our pbuilderc is setup to only use eatmydata on armhf - because amd64+arm64 build on tmpfs anyway (which is not true anymore...)
mv jenkins:/dev/vda1 to SDD, free 500gb hdd space
increase to 640gb? more partitions?
is /srv/workspace on jenkins on tmpfs (with 100gb size) really a good idea, especially with / on sdd?
=====================================
TODO.legacy
=====================================
@@ -60,7 +60,6 @@
** maintenance.sh: delete the history pages once a page has been removed from all suites+archs
** reproducible.debian.net rename: rgrep all the files…
** debbindiff2diffoscope rename: do s#dbd#ds#g and s#DBD#DS#g and rename dbd directories?
-** diffoscope needs to be run on the target arch... (or rather: run on a 64bit architecture for 64bit architectures and on 32bit for 32 bit archs), this should probably be doable with a simple i386 chroot on the host (so using qemu-static to run it on armhf should not be needed, probably.)
** support for arbitrary (to be implemented) Debian-PPAs and external repos, by just giving a source URL
** once stabilized notification emails should go through the package tracker. The 'build' keyword seems to be the better fit for this. To do so just send the emails to dispatch at tracker.debian.org, setting "X-Distro-Tracker-Package: foo" and "X-Distro-Tracker-Keyword: build". This way people wanting to subscribe to our notification don't need to ask us and can do that by themselves.
** repo-comparison: check for binaries without source
@@ -76,14 +75,12 @@
*** add support for disabling archs and for shutdown+respan of workers
*** add support for starting/stopping workers for specific archs
* missing variations:
-** 32/64 bit kernel variation on i386
** prebuilder does (user) group variation like this: https://salsa.debian.org/reproducible-builds/reproducible-misc/blob/master/prebuilder/pbuilderhooks/A02_user
** variation of $TERM and $COLUMN (and maybe $LINES), unset in the first run, set to "linux" and "77" (and maybe "42") in the 2nd run.
*** actually TERM is set to "linux" by default already, COLUMN is unset
** vary order of $PATH entries, see #844500
** vary the length of the build paths (/build/first vs /build/second), only once the unreproducibilities caused by different build paths are solved
** vary the init system: sysv and systemd
-** vary SSD/HDD on i386?
** vary temp dir variables such as TMP/TMPDIR/TEMP/TEMPDIR/MAGICK_TMPDIR
** maybe vary build with pbuilder and sbuild (but maybe only useful with different setup jobs only…)
=====================================
TODO.trixie
=====================================
@@ -40,7 +40,6 @@
** add trixie jobs in job-cfg/packages-tests.yaml, drop buster ones
** add trixie jobs in job-cfg/piuparts.yaml, drop buster ones
** update suite names in README
-** upgrade i386 nodes to bookworm
** upgrade amd64 nodes to bookworm (except jenkins)
*** see below for how to upgrade to postgresql-15 on ionos7
** upgrade armhf nodes to bookworm
=====================================
bin/djm
=====================================
@@ -58,7 +58,7 @@ ONE_C="%42s %12s\n"
#
node_in_the_future () {
case "$1" in
- ionos5-amd64*|ionos6-i386*|ionos15-amd64*|ionos16-i386*) true ;;
+ ionos5-amd64*|ionos15-amd64*) true ;;
codethink03*) true ;;
osuosl2*) true ;;
infom02*) true ;;
@@ -442,7 +442,6 @@ get_arch_color() {
#
case "$1" in
*amd64*) BG=lightgreen ;;
- *i386*) BG=lightblue ;;
*arm64*) BG=orange ;;
*armhf*) BG=lightyellow ;;
*riscv64*) BG=orchid1 ;;
=====================================
bin/jenkins_node_definitions.sh
=====================================
@@ -22,13 +22,9 @@ codethink04-arm64.debian.net
ff4a-armhf-rb.debian.net
ff64a-armhf-rb.debian.net
ionos1-amd64.debian.net
-ionos2-i386.debian.net
ionos5-amd64.debian.net
-ionos6-i386.debian.net
ionos11-amd64.debian.net
-ionos12-i386.debian.net
ionos15-amd64.debian.net
-ionos16-i386.debian.net
virt32a-armhf-rb.debian.net
virt32b-armhf-rb.debian.net
virt32c-armhf-rb.debian.net
@@ -48,7 +44,7 @@ NODE_RUN_IN_THE_FUTURE=false
get_node_information() {
local NODE_NAME=$1
case "$NODE_NAME" in
- ionos[56]*|ionos1[56]*)
+ ionos5*|ionos15*)
NODE_RUN_IN_THE_FUTURE=true
;;
codethink03*)
=====================================
bin/reproducible_blacklist.sh
=====================================
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2014-2023 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2025 Holger Levsen <holger at layer-acht.org>
# © 2015 Mattia Rizzolo <mattia at mapreri.org>
# released under the GPLv2
@@ -64,7 +64,7 @@ explain_syntax() {
set +x
ARCH="$1"
shift
-if [ "$ARCH" != "amd64" ] && [ "$ARCH" != "armhf" ] && [ "$ARCH" != "i386" ] && [ "$ARCH" != "arm64" ] ; then
+if [ "$ARCH" != "amd64" ] && [ "$ARCH" != "armhf" ] && [ "$ARCH" != "arm64" ] ; then
explain_syntax
exit 1
fi
=====================================
bin/reproducible_build.sh
=====================================
@@ -1,7 +1,7 @@
#!/bin/bash
# vim: set noexpandtab:
-# Copyright 2014-2024 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2025 Holger Levsen <holger at layer-acht.org>
# © 2015-2023 Mattia Rizzolo <mattia at debian.org>
# released under the GPLv2
@@ -608,10 +608,6 @@ first_build() {
*) NUM_CPU=5 ;;
esac
;;
- i386)
- # reduce load on i386 nodes
- let NUM_CPU-=2
- ;;
*) ;;
esac
# Temporarily disable fixfilepath on bullseye, to get better data about:
@@ -702,7 +698,7 @@ second_build() {
echo "============================================================================="
set -x
local TMPCFG=$(mktemp -t pbuilderrc_XXXX --tmpdir=$TMPDIR)
- # on amd64+i386 we vary this based on node choices (by design)
+ # on amd64 we vary this based on node choices (by design)
case ${ARCH} in
armhf)
# Reduce parallelism on armhf systems with a lot of cores to
@@ -712,10 +708,6 @@ second_build() {
8) NUM_CPU=6 ;;
esac
;;
- i386)
- # reduce load on i386 nodes
- let NUM_CPU-=3
- ;;
*) ;;
esac
# differ locale+language depending on the architecture (mostly for readability by different people…)
@@ -726,9 +718,6 @@ second_build() {
arm64) locale=nl_BE
language=nl
;;
- i386) locale=de_CH
- language=de
- ;;
*) locale=et_EE
language=et
;;
=====================================
bin/reproducible_html_nodes_info.sh
=====================================
@@ -61,10 +61,7 @@ build_nodes_health_page() {
for NODE in $BUILD_NODES ; do
REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES $NODE"
- if [ "$NODE" = "ionos2-i386.debian.net" ] ; then
- # ionos4 squid
- REPRODUCIBLE_NODES="$REPRODUCIBLE_NODES ionos4-amd64.debian.net"
- elif [ "$NODE" = "ionos5-amd64.debian.net" ] ; then
+ if [ "$NODE" = "ionos5-amd64.debian.net" ] ; then
# ionos7 buildinfos.debian.net jobs
# ionos9 rebootstrap jobs
# ionos10 chroot jobs
=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -505,7 +505,6 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
osuosl*) NODE="osuosl${NODE_ALIAS#osuosl}-amd64.debian.net" ;;
*) NODE="$NODE_ALIAS-amd64.debian.net" ;;
esac ;;
- i386) NODE="$NODE_ALIAS-i386.debian.net" ;;
arm64) NODE="codethink${NODE_ALIAS#codethink}-arm64.debian.net" ;;
armhf) NODE="${NODE_ALIAS}-armhf-rb.debian.net" ;;
riscv64) NODE="${NODE_ALIAS}.debian.net" ;;
=====================================
bin/reproducible_system_health.sh
=====================================
@@ -369,7 +369,6 @@ for JOB_NAME in $(ls -1d reproducible_* | sort ) ; do
reproducible_maintenance_amd64_ionos4) MODIFIER=500 ;; # proxy for other nodes
reproducible_maintenance_amd64_ionos14) MODIFIER=500 ;; # proxy for other nodes
reproducible_maintenance_amd64_*) MODIFIER=20 ;;
- reproducible_maintenance_i386_*) MODIFIER=10 ;;
reproducible_maintenance_arm64_codethink04) MODIFIER=500 ;; # proxy for other nodes
reproducible_maintenance_arm64_*) MODIFIER=10 ;;
reproducible_maintenance_armhf_*) MODIFIER=3 ;;
@@ -377,7 +376,6 @@ for JOB_NAME in $(ls -1d reproducible_* | sort ) ; do
reproducible_node_health_check_amd64_ionos4) MODIFIER=150 ;;
reproducible_node_health_check_amd64_ionos14) MODIFIER=150 ;;
reproducible_node_health_check_amd64_*) MODIFIER=20 ;;
- reproducible_node_health_check_i386_*) MODIFIER=10 ;;
reproducible_node_health_check_arm64_codethink04) MODIFIER=150 ;;
reproducible_node_health_check_arm64_*) MODIFIER=10 ;;
reproducible_node_health_check_armhf_*) MODIFIER=3 ;;
=====================================
hosts/common/etc/pbuilderrc
=====================================
@@ -7,9 +7,9 @@
#
# cater for different locations
MIRRORSITE="http://deb.debian.org/debian"
-# only use eatmydata on armhf+i386 - on amd64+arm64 we build on tmpfs anyway
+# only use eatmydata on armhf - on amd64+arm64 we build on tmpfs anyway
case $HOSTNAME in
- *i386*|*armhf*)
+ *armhf*)
EATMYDATA=yes ;;
*) ;;
esac
@@ -29,7 +29,7 @@ fi
# needed to ignore failures due to running 398 days in the future…
# (only on those nodes running in the future…)
case $HOSTNAME in
- ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386|codethink03-arm64|infom02-amd64)
+ ionos5-amd64|ionos15-amd64|codethink03-arm64|infom02-amd64)
APTGETOPT=(-o Acquire::Check-Valid-Until="false")
;;
*) ;;
=====================================
hosts/ionos12-i386/etc/apt/apt.conf.d/80proxy deleted
=====================================
@@ -1 +0,0 @@
-Acquire::http::Proxy "http://46.16.76.132:3128";
=====================================
hosts/ionos16-i386/etc/apt/apt.conf.d/80proxy deleted
=====================================
@@ -1 +0,0 @@
-Acquire::http::Proxy "http://213.165.73.152:3128";
=====================================
hosts/ionos2-i386/etc/apt/apt.conf.d/80proxy deleted
=====================================
@@ -1 +0,0 @@
-Acquire::http::Proxy "http://46.16.76.132:3128";
=====================================
hosts/ionos6-i386/etc/apt/apt.conf.d/80proxy deleted
=====================================
@@ -1 +0,0 @@
-Acquire::http::Proxy "http://213.165.73.152:3128";
=====================================
jenkins-home/offline_nodes
=====================================
@@ -27,12 +27,6 @@ virt64b-armhf-rb.debian.net
virt64c-armhf-rb.debian.net
virt64z-armhf-rb.debian.net
-# i386 will be dropped from tests.r-b.o/debian, this is the start...
-ionos2-i386.debian.net
-ionos12-i386.debian.net
-ionos6-i386.debian.net
-ionos16-i386.debian.net
-
# needs investigation
# Down here nodes are automatically added by the maintenance job when they have
=====================================
update_jdn.sh
=====================================
@@ -59,7 +59,7 @@ explain "$(date) - begin deployment update."
# some nodes run in the future and need special treatment…
case $HOSTNAME in
- ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386|codethink03*)
+ ionos5-amd64|ionos15-amd64|codethink03*)
# set correct date
set_correct_date de.pool.ntp.org
;;
@@ -225,12 +225,6 @@ case $HOSTNAME in
*) ;;
esac
case $HOSTNAME in
- ionos*i386)
- if ! grep -q '/srv/workspace' /etc/fstab; then
- echo "Warning: you need to manually create a /srv/workspace partition on i386 nodes, exiting."
- exit 1
- fi
- ;;
osuosl*-amd64)
if ! grep -q '/srv/workspace' /etc/fstab; then
echo "Warning: you need to manually create a /srv/workspace partition on OSUOSL nodes, exiting."
@@ -288,7 +282,7 @@ fi
# deploy package configuration in /etc, /usr, /var and /opt
#
cd $BASEDIR
-for h in common common-amd64 common-i386 common-arm64 common-armhf common-riscv64 common-ppc64el "$HOSTNAME" ; do
+for h in common common-amd64 common-arm64 common-armhf common-riscv64 common-ppc64el "$HOSTNAME" ; do
if [ "$HOSTNAME" = "rb-mail1" ]; then
# the mail server is managed by ansible elsewhere.
continue
@@ -296,7 +290,6 @@ for h in common common-amd64 common-i386 common-arm64 common-armhf common-riscv6
# $HOSTNAME has precedence over common-$DPKG_ARCH over common
case $h in
common-amd64) [ $DPKG_ARCH = "amd64" ] || continue ;;
- common-i386) [ $DPKG_ARCH = "i386" ] || continue ;;
common-arm64) [ $DPKG_ARCH = "arm64" ] || continue ;;
common-armhf) [ $DPKG_ARCH = "armhf" ] || continue ;;
common-riscv64) [ $DPKG_ARCH = "riscv64" ] || continue ;;
@@ -484,7 +477,7 @@ if [ -f /etc/debian_version ] ; then
esac
# needed to run the 2nd reproducible builds nodes in the future...
case $HOSTNAME in
- ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386) DEBS="$DEBS ntpdate" ;;
+ ionos5-amd64|ionos15-amd64) DEBS="$DEBS ntpdate" ;;
codethink03*) DEBS="$DEBS ntpdate" ;;
osuosl2*) DEBS="$DEBS ntpdate" ;;
infom02*) DEBS="$DEBS ntpdate" ;;
@@ -700,7 +693,7 @@ if [ -f /etc/debian_version ] ; then
$UP2DATE || sudo apt-get update
$UP2DATE || sudo apt-get install $DEBS $MASTERDEBS
# for varying kernels:
- # - we use bpo kernels on osuosl2 and ionos5+15 and infom02+08 (and the default amd64 kernel on ionos6+16-i386)
+ # - we use bpo kernels on osuosl2 and ionos5+15 and infom02+08
# - this is done as a separate step as bpo kernels are frequently uninstallable when upgraded on bpo
if [ "$HOSTNAME" = "ionos5-amd64" ] || [ "$HOSTNAME" = "ionos15-amd64" ] \
|| [ "$HOSTNAME" = "osuosl2-amd64" ] \
@@ -708,10 +701,6 @@ if [ -f /etc/debian_version ] ; then
|| [ "$HOSTNAME" = "jenkins" ] ; then
sudo apt install linux-image-amd64/bookworm-backports || true # backport kernels are frequently uninstallable...
:
- elif [ "$HOSTNAME" = "ionos6-i386" ] || [ "$HOSTNAME" = "ionos16-i386" ] \
- || [ "$HOSTNAME" = "ionos2-i386" ] || [ "$HOSTNAME" = "ionos12-i386" ] ; then
- # run amd64 kernel on all i386 nodes
- sudo apt install linux-image-amd64
#elif [ "$HOSTNAME" = "osuosl1-amd64" ] || [ "$HOSTNAME" = "osuosl2-amd64" ] ; then
# # building latest stuff sometimes (eg, currently Qt) needs newer kernel to build...
# sudo apt install linux-image-amd64/bookworm-backports || true # backport kernels are frequently uninstallable...
@@ -1057,7 +1046,7 @@ fi
#
# generate the kgb-client configurations
#
-if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "osuosl1-amd64" ] || [ "$HOSTNAME" = "osuosl2-amd64" ] || [ "$HOSTNAME" = "osuosl3-amd64" ] || [ "$HOSTNAME" = "ionos2-i386" ] || [ "$HOSTNAME" = "ionos12-i386" ] ; then
+if [ "$HOSTNAME" = "jenkins" ] || [ "$HOSTNAME" = "osuosl1-amd64" ] || [ "$HOSTNAME" = "osuosl2-amd64" ] || [ "$HOSTNAME" = "osuosl3-amd64" ] ; then
cd $BASEDIR
KGB_SECRETS="/srv/jenkins/kgb/secrets.yml"
sudo mkdir -p $(dirname $KGB_SECRETS)
@@ -1135,7 +1124,7 @@ fi
#
case $HOSTNAME in
# set time back to the future
- ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386)
+ ionos5-amd64|ionos15-amd64)
disable_dsa_check_packages
sudo date --set="+398 days +6 hours + 23 minutes"
;;
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/92a1f3ca77d549a9b5ed2e4f2010e8072ed271b6
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/92a1f3ca77d549a9b5ed2e4f2010e8072ed271b6
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/20250521/38cc14f1/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list