[Git][qa/jenkins.debian.net][master] reproducible Debian: split create_meta_pkg_sets job in two (unstable+testing)...
Holger Levsen (@holger)
gitlab at salsa.debian.org
Wed Jul 5 23:12:19 BST 2023
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
e14d6d37 by Holger Levsen at 2023-07-06T00:11:59+02:00
reproducible Debian: split create_meta_pkg_sets job in two (unstable+testing) to half job run time to 90min
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
3 changed files:
- bin/common-functions.sh
- bin/reproducible_create_meta_pkg_sets.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|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_stretch|lintian-tests_buster|lintian-tests_buster-backports|lintian-tests_bullseye|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|debian-archive-keyring-tests_buster|debian-archive-keyring-tests_bullseye|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|chroot-installation_buster|udd_buster_multiarch_versionskew|disorderfs_from_git|reprotest_from_git|diffoscope_from_git' || 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_stretch|lintian-tests_buster|lintian-tests_buster-backports|lintian-tests_bullseye|udd_stretch|d-i_pu-build|debsums-tests_stretch|debian-archive-keyring-tests_stretch|debian-archive-keyring-tests_buster|debian-archive-keyring-tests_bullseye|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|chroot-installation_buster|udd_buster_multiarch_versionskew|disorderfs_from_git|reprotest_from_git|diffoscope_from_git|reproducible_create_meta_pkg_sets$' || true)"
if [ -n "$ZOMBIES" ] ; then
DIRTY=true
figlet 'zombies!!!'
=====================================
bin/reproducible_create_meta_pkg_sets.sh
=====================================
@@ -581,27 +581,26 @@ TMPFILE2=$(mktemp --tmpdir=$TEMPDIR pkg-sets-XXXXXXXXX)
TMPFILE3=$(mktemp --tmpdir=$TEMPDIR pkg-sets-XXXXXXXXX)
index=0
-# loop through all suites still in development, except experimental
-for SUITE in ${TESTING_SUITE} unstable ; do
- echo "============================================================================="
- echo "$(date -u) - Creating meta package sets for $SUITE now."
- echo
+# main
+SUITE=$1
- DISTNAME="$SUITE-$ARCH"
- TPATH=~jenkins/userContent/reproducible/debian/pkg-sets/$SUITE
- mkdir -p $TPATH
+echo "============================================================================="
+echo "$(date -u) - Creating meta package sets for $SUITE now."
+echo
- PACKAGES=$(ls $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_binary-${ARCH}_Packages)
- SOURCES=$(ls $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_source_Sources)
- echo "============================================================================="
- echo "$(date -u) - Creating meta package sets for $SUITE now."
- echo "============================================================================="
- update_pkg_sets
+DISTNAME="$SUITE-$ARCH"
+TPATH=~jenkins/userContent/reproducible/debian/pkg-sets/$SUITE
+mkdir -p $TPATH
- echo
- echo "============================================================================="
- echo "$(date -u) - Done updating all meta package sets for $SUITE."
-done
+PACKAGES=$(ls $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_binary-${ARCH}_Packages)
+SOURCES=$(ls $CHPATH/$DISTNAME/var/lib/apt/lists/*_dists_${SUITE}_main_source_Sources)
+echo "============================================================================="
+echo "$(date -u) - Creating meta package sets for $SUITE now."
+echo "============================================================================="
+update_pkg_sets
echo
+echo "============================================================================="
+echo "$(date -u) - Done updating all meta package sets for $SUITE."
+echo
=====================================
job-cfg/reproducible.yaml
=====================================
@@ -553,9 +553,14 @@
- 'nodes_info':
my_description: 'Collect various information from build nodes used for reproducible builds.'
my_timed: '0 0 * * *'
- - 'create_meta_pkg_sets':
- my_description: 'Create meta package sets for later consumption when generating HTML stats.'
+ - 'create_meta_pkg_sets_unstable':
+ my_description: 'Create meta package sets for unstable for later consumption when generating HTML stats.'
my_timed: '0 6 * * H/3'
+ my_shell: '/srv/jenkins/bin/reproducible_create_meta_pkg_sets.sh unstable'
+ - 'create_meta_pkg_sets_trixie':
+ my_description: 'Create meta package sets for trixie for later consumption when generating HTML stats.'
+ my_timed: '0 6 * * H/3'
+ my_shell: '/srv/jenkins/bin/reproducible_create_meta_pkg_sets.sh trixie'
- 'mmdebstrap_unstable':
my_description: 'Check mmdebstrap of unstable is reproducible.'
my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh mmdebstrap unstable'
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/e14d6d377c1676305b10671847ea7114dd2b6e82
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/e14d6d377c1676305b10671847ea7114dd2b6e82
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/20230705/6b2bbdc7/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list