[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: reproducible Debian: create meta pkg sets: catch all errors

[Holger Levsen (@holger)]

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


Commits:
fbf9d543 by Holger Levsen at 2022-09-24T15:04:23+02:00
reproducible Debian: create meta pkg sets: catch all errors

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

- - - - -
71a8009c by Holger Levsen at 2022-09-24T15:50:42+02:00
reproducible Debian maintenance: cleanup leftovers from live-build rsyncs

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

- - - - -


2 changed files:

- bin/reproducible_create_meta_pkg_sets.sh
- bin/reproducible_maintenance.sh


Changes:

=====================================
bin/reproducible_create_meta_pkg_sets.sh
=====================================
@@ -10,6 +10,10 @@ common_init "$@"
 # common code for tests.reproducible-builds.org
 . /srv/jenkins/bin/reproducible_common.sh
 
+# we want to catch errors
+set -e
+set -o pipefail		# see eg http://petereisentraut.blogspot.com/2010/11/pipefail.html
+
 # we only generate the meta pkg sets on amd64
 # (else this script would need a lot of changes for little gain)
 # but these are source package sets so differences happen only very rarely anyway


=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -747,11 +747,23 @@ echo "$(date -u) - Checking for artifacts from debian live build jobs, that are
 ARTIFACTS=$(find $BASE/debian_live_build/artifacts/r00t-me/* -maxdepth 1 -type f -mtime +1 -exec ls -lad {} \; 2>/dev/null|| true)
 if [ ! -z "$ARTIFACTS" ] ; then
 	echo
-	echo "Removed old artifacts:"
+	echo "Removed old debian-live artifacts:"
 	find $BASE/debian_live_build/artifacts/r00t-me/* -maxdepth 1 -type f -mtime +1 -exec rm -rv --one-file-system {} \; || true
 	echo
 fi
 
+# remove leftovers from rsyncing live-build results
+echo "$(date -u) - Checking for leftovers from rsyncing live-build results, that are older than a day."
+dir=/var/lib/jenkins/userContent
+ARTIFACTS=$(find $dir/reproducible-rsync-????-* -maxdepth 1 -type d -mtime +1 -exec ls -lad {} \; 2>/dev/null|| true)
+if [ ! -z "$ARTIFACTS" ] ; then
+	echo
+	echo "Removed leftovers from rsyncing live-build artifacts:"
+	find $dir/reproducible-rsync-????-* -maxdepth 1 -type d -mtime +1 -exec rm -rv --one-file-system {} \; || true
+	echo
+fi
+
+
 # find + chmod files with bad permissions
 echo "$(date -u) - Checking for files with bad permissions."
 # automatically fix rbuild files with wrong permissions...



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/b88030dd2ca347d1040cc00e0fb1388a14e9374c...71a8009c7e7f43d696a4f24f47abd03cd46bced9

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/b88030dd2ca347d1040cc00e0fb1388a14e9374c...71a8009c7e7f43d696a4f24f47abd03cd46bced9
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/20220924/1dc068e0/attachment-0001.htm>