[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] reproducible: merge several "diffoscope available in distro X" jobs into one
Holger Levsen
gitlab at salsa.debian.org
Tue Jun 23 22:27:55 BST 2020
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
0d14e667 by Holger Levsen at 2020-06-23T23:27:40+02:00
reproducible: merge several "diffoscope available in distro X" jobs into one
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
3 changed files:
- bin/common-functions.sh
- bin/diffoscope_distribution_test.sh
- job-cfg/reproducible.yaml
Changes:
=====================================
bin/common-functions.sh
=====================================
@@ -218,7 +218,7 @@ jenkins_zombie_check() {
# and we dont know why and when that happens,
# so just report those zombies here.
#
- 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|odc2a|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|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-8]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_|disorderfs_from_git_master' || 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|odc2a|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|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-8]($|_)|brcm47xx|rebootstrap_kfreebsd|diffoscope_from_git_|disorderfs_from_git_master|diffoscope_pypi|diffoscope_freebsd|diffoscope_netbsd|diffoscope_macports|diffoscope_archlinux' || true)
if [ ! -z "$ZOMBIES" ] ; then
DIRTY=true
figlet 'zombies!!!'
=====================================
bin/diffoscope_distribution_test.sh
=====================================
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2014-2019 Holger Levsen <holger at layer-acht.org>
+# Copyright 2014-2020 Holger Levsen <holger at layer-acht.org>
# released under the GPLv2
DEBUG=false
@@ -35,7 +35,6 @@ check_pypi() {
echo "Fail: diffoscope in Debian: $DIFFOSCOPE_IN_DEBIAN"
echo "Fail: diffoscope in PyPI: $DIFFOSCOPE_IN_PYPI"
send_irc_warning "It seems diffoscope $DIFFOSCOPE_IN_DEBIAN is not available on PyPI, which only has $DIFFOSCOPE_IN_PYPI."
- exit 0
else
echo "diffoscope in Debian: $DIFFOSCOPE_IN_DEBIAN"
echo "diffoscope in PyPI: $DIFFOSCOPE_IN_PYPI"
@@ -59,7 +58,6 @@ check_github_macports() {
echo "Fail: diffoscope in Debian: $DIFFOSCOPE_IN_DEBIAN"
echo "Fail: diffoscope on MacPorts: $DIFFOSCOPE_IN_MACPORTS"
send_irc_warning "It seems diffoscope $DIFFOSCOPE_IN_DEBIAN is not available on MacPorts, which only has $DIFFOSCOPE_IN_MACPORTS."
- exit 0
else
echo "diffoscope in Debian: $DIFFOSCOPE_IN_DEBIAN"
echo "diffoscope in MacPorts: $DIFFOSCOPE_IN_MACPORTS"
@@ -89,7 +87,6 @@ check_whohas() {
echo "Fail: diffoscope in Debian: $DIFFOSCOPE_IN_DEBIAN"
echo "Fail: diffoscope in $DISTRIBUTION: $DIFFOSCOPE_IN_WHOHAS"
send_irc_warning "It seems diffoscope $DIFFOSCOPE_IN_DEBIAN is not available on $DISTRIBUTION, which only has $DIFFOSCOPE_IN_WHOHAS." "$CHANNEL"
- exit 0
elif [ "${DIFFOSCOPE_IN_DEBIAN}-1" = "$DIFFOSCOPE_IN_WHOHAS" ] ; then
# archlinux package version can greater than Debian: 52-1 vs 52
# workaround this above...
@@ -122,19 +119,21 @@ if [ "$DIFFOSCOPE_IN_DEBIAN" = "" ] ; then
exit 0
fi
-case $1 in
- PyPI) check_pypi
- ;;
- FreeBSD|NetBSD|Arch)
- DISTRIBUTION=$1
- check_whohas
- # missing tests: Fedora, openSUSE, maybe OpenBSD, Guix…
- ;;
- MacPorts)
- check_github_macports
- ;;
- *)
- echo "Unsupported distribution."
- exit 1
- ;;
-esac
+for PROJECT in PyPI FreeBSD NetBSD MacPorts Arch ; do
+ case $PROJECT in
+ PyPI) check_pypi
+ ;;
+ FreeBSD|NetBSD|Arch)
+ DISTRIBUTION=$PROJECT
+ check_whohas
+ # missing tests: Fedora, openSUSE, maybe OpenBSD, Guix…
+ ;;
+ MacPorts)
+ check_github_macports
+ ;;
+ *)
+ echo "Unsupported distribution."
+ exit 1
+ ;;
+ esac
+done
=====================================
job-cfg/reproducible.yaml
=====================================
@@ -605,27 +605,11 @@
my_description: 'Build a simple webpage for Fedora 23 reproducibility tests'
my_timed: ''
my_shell: '/srv/jenkins/bin/reproducible_html_rpms.sh fedora-23 x86_64'
- - 'diffoscope_pypi':
- my_description: 'Test whether PyPI has the latest diffoscope.'
+ - 'diffoscope_distributions':
+ my_description: 'Test whether several distributions have the latest diffoscope.'
my_timed: '23 23 * * *'
- my_shell: '/srv/jenkins/bin/diffoscope_distribution_test.sh PyPI'
+ my_shell: '/srv/jenkins/bin/diffoscope_distribution_test.sh'
my_recipients: 'jenkins+reproducible-builds qa-jenkins-scm at lists.alioth.debian.org'
- - 'diffoscope_freebsd':
- my_description: 'Test whether FreeBSD has the latest diffoscope.'
- my_timed: '25 23 * * 1'
- my_shell: '/srv/jenkins/bin/diffoscope_distribution_test.sh FreeBSD'
- - 'diffoscope_netbsd':
- my_description: 'Test whether NetBSD has the latest diffoscope.'
- my_timed: '27 23 * * 1'
- my_shell: '/srv/jenkins/bin/diffoscope_distribution_test.sh NetBSD'
- - 'diffoscope_macports':
- my_description: 'Test whether MacPorts has the latest diffoscope.'
- my_timed: '29 23 * * 1'
- my_shell: '/srv/jenkins/bin/diffoscope_distribution_test.sh MacPorts'
- - 'diffoscope_archlinux':
- my_description: 'Test whether Arch Linux has the latest diffoscope.'
- my_timed: '31 23 * * 1'
- my_shell: '/srv/jenkins/bin/diffoscope_distribution_test.sh Arch'
- 'compare_Debian_sha1sums':
my_description: 'Compare sha1sums of Debian binary packages with rebuild ones'
my_timed: '55 23 * * *'
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/0d14e6676b1b260ccf8ce849b57c0302dbf7ece1
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/0d14e6676b1b260ccf8ce849b57c0302dbf7ece1
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/20200623/c2a83c91/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list