Skip to content
GitLab
Commit 4caa6431 authored by Holger Levsen's avatar Holger Levsen
Browse files

Revert "properly delete old schroot overlays" 

This reverts commit 99ca0c3d.
parent ee9eeb4b
Hide whitespace changes
Inline Side-by-side
bin/reproducible_maintenance.sh
View file @ 4caa6431
...@@ -410,10 +410,10 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then ...@@ -410,10 +410,10 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
dir=/var/lib/schroot/$path/ dir=/var/lib/schroot/$path/
if [ "$path" = "session" ] ; then if [ "$path" = "session" ] ; then
FILETYPE=f FILETYPE=f
RM_OPTIONS="-v" RM=rm
else else
FILETYPE=d FILETYPE=d
RM_OPTIONS="-rv --one-file-system" RM=rmdir
fi fi
OLDSTUFF=$(find "$dir" -name "jenkins-reproducible-*-diffoscope-*" -mindepth 1 -maxdepth 1 -type $FILETYPE -mtime +1 -exec ls -lad {} \; || true) OLDSTUFF=$(find "$dir" -name "jenkins-reproducible-*-diffoscope-*" -mindepth 1 -maxdepth 1 -type $FILETYPE -mtime +1 -exec ls -lad {} \; || true)
if [ ! -z "$OLDSTUFF" ]; then if [ ! -z "$OLDSTUFF" ]; then
...@@ -422,7 +422,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then ...@@ -422,7 +422,7 @@ if [ "$HOSTNAME" = "$MAINNODE" ] ; then
echo "$OLDSTUFF" | sed "s#$dir#./#g" echo "$OLDSTUFF" | sed "s#$dir#./#g"
echo echo
find "$dir" -name "jenkins-reproducible-*-diffoscope-*" -mindepth 1 -maxdepth 1 -type $FILETYPE -mtime +1 -exec sudo rm $RM_OPTIONS {} \; || true find "$dir" -name "jenkins-reproducible-*-diffoscope-*" -mindepth 1 -maxdepth 1 -type $FILETYPE -mtime +1 -exec sudo $RM -v {} \; || true
OLDSTUFF=$(find "$dir" -name "jenkins-reproducible-*-diffoscope-*" -mindepth 1 -maxdepth 1 -type $FILETYPE -mtime +1 -exec ls -lad {} \; || true) OLDSTUFF=$(find "$dir" -name "jenkins-reproducible-*-diffoscope-*" -mindepth 1 -maxdepth 1 -type $FILETYPE -mtime +1 -exec ls -lad {} \; || true)
if [ ! -z "$OLDSTUFF" ]; then if [ ! -z "$OLDSTUFF" ]; then
echo echo
......
hosts/jenkins/etc/sudoers.d/jenkins
View file @ 4caa6431
...@@ -23,8 +23,8 @@ jenkins ALL= \ ...@@ -23,8 +23,8 @@ jenkins ALL= \
/bin/rm -rf --one-file-system /var/lib/sbuild/build/*, \ /bin/rm -rf --one-file-system /var/lib/sbuild/build/*, \
/bin/rm -rf --one-file-system /tmp/*, \ /bin/rm -rf --one-file-system /tmp/*, \
/bin/rm -rv --one-file-system /tmp/*, \ /bin/rm -rv --one-file-system /tmp/*, \
/bin/rm -rv --one-file-system /var/lib/schroot/*, \
/bin/rm -v /var/lib/schroot/*, \ /bin/rm -v /var/lib/schroot/*, \
/bin/rmdir -v /var/lib/schroot/*, \
/bin/mv /chroots/* /schroots/*, \ /bin/mv /chroots/* /schroots/*, \
/bin/mv /schroots/* /schroots/*, \ /bin/mv /schroots/* /schroots/*, \
/bin/umount -l /chroots/*, \ /bin/umount -l /chroots/*, \
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment