[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: use pool directory structure
Holger Levsen
gitlab at salsa.debian.org
Wed Feb 20 15:14:58 GMT 2019
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
7f075605 by Holger Levsen at 2019-02-20T15:12:01Z
reproducible Debian: use pool directory structure
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
482833ac by Holger Levsen at 2019-02-20T15:14:48Z
reproducible Debian: improve output
Signed-off-by: Holger Levsen <holger at layer-acht.org>
- - - - -
1 changed file:
- bin/reproducible_compare_Debian_sha1sums.sh
Changes:
=====================================
bin/reproducible_compare_Debian_sha1sums.sh
=====================================
@@ -73,14 +73,18 @@ cleanup_all() {
trap cleanup_all INT TERM EXIT
for package in $packages ; do
+ cd $SHA1DIR
+ echo
echo "$(date -u) - checking whether we have seen the .deb for $package before"
version=$(grep-dctrl -X -P ${package} -s version -n $PACKAGES)
arch=$(grep-dctrl -X -P ${package} -s Architecture -n $PACKAGES)
package_file="${package}_$(echo $version | sed 's#:#%3a#')_${arch}.deb"
- #pool_dir="$(dirname $filename)"
+ pool_dir="$(dirname $(grep-dctrl -X -P ${package} -s Filename -n $PACKAGES))"
+ mkdir -p $pool_dir
+ cd $pool_dir
if [ ! -e ${package_file}.sha1output ] ; then
- echo "$(date -u) - preparing to download $filename"
- schroot --directory $SHA1DIR -c chroot:jenkins-reproducible-unstable-diffoscope apt-get download ${package} || continue
+ echo -n "$(date -u) - preparing to download $filename"
+ ( schroot --directory $SHA1DIR -c chroot:jenkins-reproducible-unstable-diffoscope apt-get download ${package} 2>&1 |xargs echo ) || continue
echo "$(date -u) - calculating sha1sum"
SHA1SUM_PKG="$(sha1sum ${package_file} | tee ${package_file}.sha1output | awk '{print $1}' )"
rm ${package_file}
@@ -97,9 +101,9 @@ for package in $packages ; do
echo "$(date -u) - generating result"
count=$(fmt ${package_file}.json | grep -c '\.buildinfo' || true)
if [ "${count}" -ge 2 ]; then
- echo "REPRODUCIBLE: $package_file: $SHA1SUM_PKG - reproduced $count times."
+ echo "$(date -u) - REPRODUCIBLE: $package_file: $SHA1SUM_PKG - reproduced $count times."
else
- echo "UNREPRODUCIBLE: $package_file: $SHA1SUM_PKG on ftp.debian.org, but nowhere else."
+ echo "$(date -u) - UNREPRODUCIBLE: $package_file: $SHA1SUM_PKG on ftp.debian.org, but nowhere else."
fi
done | tee $log
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/85dd7f16bdcc329f34daf5beacc65ace0797019f...482833ac5e92971664a3261e26ca20f0a8048a70
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/85dd7f16bdcc329f34daf5beacc65ace0797019f...482833ac5e92971664a3261e26ca20f0a8048a70
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/20190220/86286a30/attachment-0001.html>
More information about the Qa-jenkins-scm
mailing list