[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: refactoring

[Holger Levsen]

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


Commits:
21acab4e by Holger Levsen at 2020-11-20T15:49:43+01:00
refactoring

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

- - - - -
8e0c6058 by Holger Levsen at 2020-11-20T15:53:50+01:00
reproducible Debian: delete old bullseye and unstable schroot even sooner

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

- - - - -


2 changed files:

- bin/reproducible_maintenance.sh
- job-cfg/reproducible.yaml


Changes:

=====================================
bin/reproducible_maintenance.sh
=====================================
@@ -478,7 +478,7 @@ cleanup_old_schroots() {
 	fi
 }
 cleanup_old_schroots "schroots" 31 "/schroots/(reproducible-.+-[0-9]{1,5}|schroot-install-.+)"
-cleanup_old_schroots "unstable and bullseye schroots" 15 "/schroots/reproducible-(unstable|bullseye)-diffoscope-.+-[0-9]{1,5}"
+cleanup_old_schroots "unstable and bullseye schroots" 5 "/schroots/reproducible-(unstable|bullseye)-diffoscope-.+-[0-9]{1,5}"
 
 # find very old schroots
 echo "$(date -u) - Detecting schroots older than 1 month"


=====================================
job-cfg/reproducible.yaml
=====================================
@@ -468,11 +468,6 @@
 
         - '{name}_setup_schroot_{my_distro}_{my_arch}_{my_hname}':
             my_distro:
-                - 'unstable_diffoscope':
-                    my_description: 'Setup schroot for running diffoscope in a unstable environment (this is needed to be able to correctly investigate haskell binaries...)'
-                    my_timed: '42 0 H/2 * *'
-                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all'
-                    my_disabled: false
                 - 'stretch_diffoscope':
                     my_description: 'Setup schroot for running diffoscope in a stretch environment (this is needed to be able to correctly investigate haskell binaries...)'
                     my_timed: '23 0 1 * *'
@@ -488,6 +483,11 @@
                     my_timed: '23 0 H/2 * *'
                     my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-bullseye-diffoscope bullseye diffoscope locales-all'
                     my_disabled: false
+                - 'unstable_diffoscope':
+                    my_description: 'Setup schroot for running diffoscope in a unstable environment (this is needed to be able to correctly investigate haskell binaries...)'
+                    my_timed: '42 0 H/2 * *'
+                    my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-unstable-diffoscope unstable diffoscope locales-all'
+                    my_disabled: false
             my_description: 'Setup {my_distro} schroot for fetching source packages for the builder jobs.'
             my_shell: '/srv/jenkins/bin/schroot-create.sh reproducible reproducible-{my_distro} {my_distro}'
             my_hname:



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/12edac2db1a5d2a339f0242b29ae7835454dd9fa...8e0c605875c4556cc6f87a78add3a156918b1c07

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/-/compare/12edac2db1a5d2a339f0242b29ae7835454dd9fa...8e0c605875c4556cc6f87a78add3a156918b1c07
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/20201120/a3a4f9a6/attachment-0001.html>