[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 3 commits: drop reproducible_setup_schroot_buster_diffoscope_amd64_osuosl3 job, as -...
Holger Levsen (@holger)
gitlab at salsa.debian.org
Mon Jun 12 11:56:54 BST 2023
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
a9f41462 by Holger Levsen at 2023-06-12T12:53:47+02:00
drop reproducible_setup_schroot_buster_diffoscope_amd64_osuosl3 job, as - except to analyze haskell packages - we always run diffoscope from unstable
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
c6e32cb2 by Holger Levsen at 2023-06-12T12:53:58+02:00
Revert "jenkins_node_wrapper: drop the schroot_*_diffoscope jobs from here, as we are not running them remotely"
This reverts commit f9d5cb389dec46445319dc9f3207132b2e8f3568.
- - - - -
9e6da49f by Holger Levsen at 2023-06-12T12:56:00+02:00
partly redo f9d5cb389: drop remote schroot_diffoscope jobs for all suites except unstable, which we do use on osuosl1-3
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
3 changed files:
- bin/common-functions.sh
- bin/jenkins_node_wrapper.sh
- job-cfg/reproducible.yaml
Changes:
=====================================
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/* | 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|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|chroot-installation_buster_.*_upgrade_to_sid|piuparts_.*_(jessie|stretch)|lintian-tests_.*_stretch|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|reproducible_.*_stretch_.*' || 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|sid_install_education-services|buster_install_education-services|lvc|chroot-installation_stretch_.*_upgrade_to_sid|chroot-installation_buster_.*_upgrade_to_sid|piuparts_.*_(jessie|stretch)|lintian-tests_.*_stretch|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|reproducible_.*_stretch_.*|buster_diffoscope_amd64_osuosl3' || true)"
if [ -n "$ZOMBIES" ] ; then
DIRTY=true
figlet 'zombies!!!'
=====================================
bin/jenkins_node_wrapper.sh
=====================================
@@ -2,7 +2,7 @@
# vim: set noexpandtab:
# Copyright (c) 2009, 2010, 2012, 2015 Peter Palfrader
-# 2015-2022 Holger Levsen
+# 2015-2023 Holger Levsen
# 2017-2018 Mattia Rizzolo <mattia at debian.org>
#
# Permission is hereby granted, free of charge, to any person obtaining
@@ -158,6 +158,8 @@ elif [[ "$*" =~ ^reproducible_maintenance_.*_.* ]] ; then
exec /srv/jenkins/bin/reproducible_maintenance.sh ; croak "Exec failed";
elif [[ "$*" =~ ^reproducible_node_health_check_.*_.* ]] ; then
exec /srv/jenkins/bin/reproducible_node_health_check.sh ; croak "Exec failed";
+elif [[ "$*" =~ ^reproducible_setup_schroot_unstable_diffoscope_.*_.* ]] ; then
+ exec /srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all openqa-client ; croak "Exec failed";
elif [[ "$*" =~ ^reproducible_coreboot ]] ; then
exec /srv/jenkins/bin/reproducible_coreboot.sh ; croak "Exec failed";
elif [[ "$*" =~ ^reproducible_openwrt ]] ; then
=====================================
job-cfg/reproducible.yaml
=====================================
@@ -523,16 +523,6 @@
- 'osuosl3': { my_arch: 'amd64' }
my_naginator_regex: '^E: Couldn.t download .*/Packages'
- - '{name}_{my_task}_{my_arch}_{my_hname}':
- my_task:
- - 'setup_schroot_buster_diffoscope':
- my_description: 'Setup schroot for running diffoscope in a buster environment'
- my_timed: '42 0 7,21 * *'
- my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
- my_hname:
- - 'osuosl3': { my_arch: 'amd64' }
- my_naginator_regex: '^E: Couldn.t download .*/Packages'
-
- '{name}_{my_task}':
my_task:
- 'db_backup':
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/5540d6f11a2da2050636e7e4231d2c27fb3eb241...9e6da49f465b2e1ed4b0aa26243b1ec207c180b2
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/5540d6f11a2da2050636e7e4231d2c27fb3eb241...9e6da49f465b2e1ed4b0aa26243b1ec207c180b2
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/20230612/5645be1f/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list