[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] this doesnt work on machines running in the future: Revert "reproducible...
Holger Levsen (@holger)
gitlab at salsa.debian.org
Fri Sep 16 15:17:06 BST 2022
Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net
Commits:
c415cbbc by Holger Levsen at 2022-09-16T16:16:29+02:00
this doesnt work on machines running in the future: Revert "reproducible Debian: avoid hardcoding the testing release name"
This reverts commit b29a06ed2d8675d1d8b3d4f45c4c78f048c50895.
- - - - -
2 changed files:
- bin/reproducible_maintenance.sh
- update_jdn.sh
Changes:
=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -483,8 +483,8 @@ cleanup_old_schroots() {
fi
}
cleanup_old_schroots "schroots" 31 "/schroots/(reproducible-.+-[0-9]{1,5}|schroot-install-.+)"
-TESTING=$(distro-info -d)
-cleanup_old_schroots "unstable and bookworm schroots" 5 "/schroots/reproducible-(unstable|$TESTING)-diffoscope-.+-[0-9]{1,5}"
+# FIXME: find a way to not forget this for the bookworm release, when trixie will become the development version
+cleanup_old_schroots "unstable and bookworm schroots" 5 "/schroots/reproducible-(unstable|bookworm)-diffoscope-.+-[0-9]{1,5}"
# find very old schroots
echo "$(date -u) - Detecting schroots older than 1 month"
=====================================
update_jdn.sh
=====================================
@@ -307,7 +307,6 @@ if [ -f /etc/debian_version ] ; then
bsd-mailx
curl
debian-archive-keyring
- distro-info
dstat
cdebootstrap-
debootstrap
@@ -383,7 +382,8 @@ if [ -f /etc/debian_version ] ; then
# needed for rebuilding Debian (using .buildinfo files)
osuosl173-amd64) DEBS="$DEBS libdpkg-perl libwww-mechanize-perl sbuild"
DEBS="$DEBS live-build" # needed for live-build
- DEBS="$DEBS cdebootstrap" ;; # needed for testing just that
+ DEBS="$DEBS cdebootstrap" # needed for testing just that
+ DEBS="$DEBS distro-info" ;; # needed for setting S_D_E to a 'good' value
# needed for opensuse openbuildservice
osuosl174-amd64) DEBS="$DEBS osc obs-build qemu-kvm libarchive-tools libjson-perl libxml-simple-perl" ;;
*) ;;
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c415cbbc61ba5601ed414f4821b33e544c35b297
--
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/commit/c415cbbc61ba5601ed414f4821b33e544c35b297
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/20220916/3a65100d/attachment-0001.htm>
More information about the Qa-jenkins-scm
mailing list