[Git][qa/jenkins.debian.net][master] for armhf.r.d.n: run codethink01 in the present

Holger Levsen (@holger) gitlab at salsa.debian.org
Tue Jan 21 23:23:17 GMT 2025



Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
6a101d8b by Holger Levsen at 2025-01-22T00:22:48+01:00
for armhf.r.d.n: run codethink01 in the present

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


8 changed files:

- bin/common-functions.sh
- bin/djm
- bin/jenkins_node_definitions.sh
- hosts/common/etc/pbuilderrc
- hosts/common/etc/rc.local
- hosts/osuosl5-amd64/var/www/html/rebuilderd-setup.html
- nodes/list.yml
- update_jdn.sh


Changes:

=====================================
bin/common-functions.sh
=====================================
@@ -233,7 +233,7 @@ jenkins_zombie_check() {
 	# this has happened on 2023-09-06 again
 	# this has happened on 2025-01 again
 	#
-	ZOMBIES="$(ls -1d /var/lib/jenkins/jobs/* | grep -E 'strip-nondeterminism|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|dpkg_buster_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|stretch|buster|bullseye)|lintian-tests|udd_stretch|d-i_pu-build|debsums-tests_(stretch|buster|bullseye)|debian-archive-keyring-tests_stretch|debian-archive-keyring-tests_buster|debian-archive-keyring-tests_bullseye|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc1[0123]($|_)|brcm47xx|rebootstrap_(kfreebsd-|nios2_)|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|archlinux|openwrt-target-(ath97|tegra)|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|live_setup_schroot|reproducible_debian_live_build$|live_build_debian_stretch_gnome|chroot-installation_stretch|chroot-installation_bullseye*upgrade_to_sid|rebuilder_prototype|osuosl167|osuosl168|osuosl169|osuosl170|osuosl171|osuosl172|osuosl173|osuosl174|osuosl184|fakeroot-foreign|fdroid|reproducible_.*_reproducible?$|health_check_amd64_snapshot|reproducible_.*_stretch_.*|buster_diffoscope_amd64_osuosl3|chroot-installation_buster|udd_buster_multiarch_versionskew|disorderfs_from_git|reprotest_from_git|diffoscope_from_git|reproducible_create_meta_pkg_sets$|reproducible_scheduler$|d-i_overview_kfreebsd|codethink9|codethink1|reproducible_.*buster|jtx|reproducible_setup_pbuilder_*ionos(4|14)|reproducible_setup_.*infom07' || true)"
+	ZOMBIES="$(ls -1d /var/lib/jenkins/jobs/* | grep -E 'strip-nondeterminism|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|dpkg_buster_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|stretch|buster|bullseye)|lintian-tests|udd_stretch|d-i_pu-build|debsums-tests_(stretch|buster|bullseye)|debian-archive-keyring-tests_stretch|debian-archive-keyring-tests_buster|debian-archive-keyring-tests_bullseye|chroot-installation_jessie|chroot-installation_.*education-lang-|kirkwoot|rebootstrap_.*_gcc1[0123]($|_)|brcm47xx|rebootstrap_(kfreebsd-|nios2_)|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|archlinux|openwrt-target-(ath97|tegra)|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|live_setup_schroot|reproducible_debian_live_build$|live_build_debian_stretch_gnome|chroot-installation_stretch|chroot-installation_bullseye*upgrade_to_sid|rebuilder_prototype|osuosl167|osuosl168|osuosl169|osuosl170|osuosl171|osuosl172|osuosl173|osuosl174|osuosl184|fakeroot-foreign|fdroid|reproducible_.*_reproducible?$|health_check_amd64_snapshot|reproducible_.*_stretch_.*|buster_diffoscope_amd64_osuosl3|chroot-installation_buster|udd_buster_multiarch_versionskew|disorderfs_from_git|reprotest_from_git|diffoscope_from_git|reproducible_create_meta_pkg_sets$|reproducible_scheduler$|d-i_overview_kfreebsd|codethink9|codethink1|reproducible_.*buster|jtx|reproducible_setup_pbuilder_*ionos(4|14)|reproducible_setup_.*infom07|reproducible_setup_pbuilder_*codethink01|reproducible_setup_pbuilder_*codethink02' || true)"
 	if [ -n "$ZOMBIES" ] ; then
 		DIRTY=true
 		figlet 'zombies!!!'


=====================================
bin/djm
=====================================
@@ -4,7 +4,7 @@
 #
 # djm - documented jenkins maintenance
 #
-# Copyright 2023-2024 Holger Levsen <holger at layer-acht.org>
+# Copyright 2023-2025 Holger Levsen <holger at layer-acht.org>
 # released under the GPLv2
 #
 
@@ -59,7 +59,7 @@ ONE_C="%42s  %12s\n"
 node_in_the_future () {
 	case "$1" in
 		ionos5-amd64*|ionos6-i386*|ionos15-amd64*|ionos16-i386*) true ;;
-		codethink01*|codethink03*) true ;;
+		codethink03*) true ;;
 		osuosl2*) true ;;
 		infom02*) true ;;
 		*) false ;;


=====================================
bin/jenkins_node_definitions.sh
=====================================
@@ -17,8 +17,6 @@ BUILD_NODES="
 cbxi4a-armhf-rb.debian.net
 cbxi4b-armhf-rb.debian.net
 cbxi4pro0-armhf-rb.debian.net
-codethink01-arm64.debian.net
-codethink02-arm64.debian.net
 codethink03-arm64.debian.net
 codethink04-arm64.debian.net
 ff4a-armhf-rb.debian.net
@@ -53,7 +51,7 @@ get_node_information() {
 	  ionos[56]*|ionos1[56]*)
 	    NODE_RUN_IN_THE_FUTURE=true
 	    ;;
-	  codethink01*|codethink03*)
+	  codethink03*)
 	    NODE_RUN_IN_THE_FUTURE=true
 	    ;;
 	  osuosl2*)


=====================================
hosts/common/etc/pbuilderrc
=====================================
@@ -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|codethink01-arm64|codethink03-arm64|infom02-amd64)
+	ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386|codethink03-arm64|infom02-amd64)
 		APTGETOPT=(-o Acquire::Check-Valid-Until="false")
 		;;
 	*)	;;


=====================================
hosts/common/etc/rc.local
=====================================
@@ -93,7 +93,6 @@ debian-distro-info --testing > /etc/debian_testing
 # run some hosts in the future
 #
 case $(hostname) in
-	codethink01*)		send_back_to_the_future ;;
 	codethink03*)		send_back_to_the_future ;;
 	ionos5*)		send_back_to_the_future ;;
 	ionos6*)		send_back_to_the_future ;;


=====================================
hosts/osuosl5-amd64/var/www/html/rebuilderd-setup.html
=====================================
@@ -132,13 +132,13 @@ sed -i "s#reproduce.debian.net#$REBUILDERD_HOSTNAME#g" index.html
 </pre>
 
 # it gets messy, how to run more archs on one machine:
-cd ; mkdir -p amd64 ; cd adm64 ; /opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd-amd64.conf
+cd ; mkdir -p amd64 ; cd amd64 ; /opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd-amd64.conf
 while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8484 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-amd64.conf debian-main ; echo sleeping 3h now ; sleep 3h ; done
 
 cd ; mkdir -p i386 ; cd i386 ; /opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd-i386.conf 
 while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8485 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-i386.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8485 pkgs sync-stdin debian main ; echo sleeping 3h now ; sleep 3h ; done
 
-cd ; mkdir -p arm64 ; cd adm64 ; /opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd-arm64.conf
+cd ; mkdir -p arm64 ; cd arm64 ; /opt/usr/bin/rebuilderd -c /opt/etc/rebuilderd-arm64.conf
 while true ; do env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8486 pkgs sync-profile --sync-config /opt/etc/rebuilderd-sync-arm64.conf debian-main --print-json | jq '.[] | select(.architecture != "all")' | jq -s | env REBUILDERD_COOKIE_PATH=~/.local/share/rebuilderd-auth-cookie /opt/usr/bin/rebuildctl -H http://127.0.0.1:8486 pkgs sync-stdin debian main ; echo sleeping 3h now ; sleep 3h ; done
 
 with rebuilderd-worker from trixie:


=====================================
nodes/list.yml
=====================================
@@ -117,7 +117,6 @@
 
 # arm64
 - hostname: codethink01-arm64.debian.net
-  time: future
   ip: 77.74.106.172
   port: 10117
   keys:


=====================================
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|codethink01*|codethink03*)
+	ionos5-amd64|ionos6-i386|ionos15-amd64|ionos16-i386|codethink03*)
 		# set correct date
 		set_correct_date de.pool.ntp.org
 		;;
@@ -469,7 +469,7 @@ if [ -f /etc/debian_version ] ; then
 		# 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" ;;
-			codethink01*|codethink03*) DEBS="$DEBS ntpdate" ;;
+			codethink03*) DEBS="$DEBS ntpdate" ;;
 			osuosl2*) DEBS="$DEBS ntpdate" ;;
 			infom02*) DEBS="$DEBS ntpdate" ;;
 			*) ;;
@@ -555,6 +555,8 @@ if [ -f /etc/debian_version ] ; then
 							diffoscope
 							python3-rpy2
 							rebuilderd-worker
+							sbuild
+							uidmap
 							" ;;
 					*) ;;
 		esac
@@ -1040,7 +1042,7 @@ case $HOSTNAME in
 		disable_dsa_check_packages
 		sudo date --set="+398 days +6 hours + 23 minutes"
 		;;
-	codethink01*|codethink03*)
+	codethink03*)
 		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/6a101d8b51a76d849ceff673793628910d7a8c03

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/6a101d8b51a76d849ceff673793628910d7a8c03
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/20250121/9ac8f1f0/attachment-0001.htm>


More information about the Qa-jenkins-scm mailing list