summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-10-17 18:16:21 +0200
committerHolger Levsen <holger@layer-acht.org>2015-10-17 18:16:21 +0200
commit4df9fffbb4e8b7e3bd7d0515a913bcda1e35fbe8 (patch)
tree74967099829c071e55ef081cc8bab275783cf9a9
parentfaf357ae87559dbe15de083b9262450003becd51 (diff)
downloadjenkins.debian.net-4df9fffbb4e8b7e3bd7d0515a913bcda1e35fbe8.tar.xz
reproducible: silently delete…
-rwxr-xr-xbin/reproducible_maintenance.sh3
-rw-r--r--hosts/bpi0-armhf-rb/etc/sudoers.d/jenkins2
-rw-r--r--hosts/cbxi4pro0-armhf-rb/etc/sudoers.d/jenkins2
-rw-r--r--hosts/hb0-armhf-rb/etc/sudoers.d/jenkins2
-rw-r--r--hosts/jenkins/etc/sudoers.d/jenkins2
-rw-r--r--hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins2
-rw-r--r--hosts/profitbricks-build2-amd64/etc/sudoers.d/jenkins2
-rw-r--r--hosts/profitbricks-build5-amd64/etc/sudoers.d/jenkins2
-rw-r--r--hosts/profitbricks-build6-amd64/etc/sudoers.d/jenkins2
-rw-r--r--hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins2
10 files changed, 11 insertions, 10 deletions
diff --git a/bin/reproducible_maintenance.sh b/bin/reproducible_maintenance.sh
index a01b4003..fd34d527 100755
--- a/bin/reproducible_maintenance.sh
+++ b/bin/reproducible_maintenance.sh
@@ -119,7 +119,8 @@ OLDSTUFF=$(find /srv/workspace/pbuilder/ -maxdepth 1 -regex '.*/[0-9]+' -type d
if [ ! -z "$OLDSTUFF" ] ; then
echo
echo "Old temp directories found in $REP_RESULTS"
- find /srv/workspace/pbuilder/ -maxdepth 1 -regex '.*/[0-9]+' -type d -mtime +3 -exec sudo rm -rvf --one-file-system {} \; || true
+ echo -n "$OLDSTUFF"
+ find /srv/workspace/pbuilder/ -maxdepth 1 -regex '.*/[0-9]+' -type d -mtime +3 -exec sudo rm -rf --one-file-system {} \; || true
echo
DIRTY=true
fi
diff --git a/hosts/bpi0-armhf-rb/etc/sudoers.d/jenkins b/hosts/bpi0-armhf-rb/etc/sudoers.d/jenkins
index 7c907aec..2dab2ae5 100644
--- a/hosts/bpi0-armhf-rb/etc/sudoers.d/jenkins
+++ b/hosts/bpi0-armhf-rb/etc/sudoers.d/jenkins
@@ -11,7 +11,7 @@ jenkins ALL= \
/bin/rm -rf --one-file-system /chroots/*, \
/bin/rm -rf --one-file-system /schroots/*, \
/bin/rm -rf --one-file-system /srv/live-build/*, \
- /bin/rm -rvf --one-file-system /srv/workspace/pbuilder/*, \
+ /bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
/bin/cp -v *.iso /srv/live-build/results/*, \
/bin/mv /chroots/* /schroots/*, \
/bin/mv /schroots/* /schroots/*, \
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/sudoers.d/jenkins b/hosts/cbxi4pro0-armhf-rb/etc/sudoers.d/jenkins
index 7c907aec..2dab2ae5 100644
--- a/hosts/cbxi4pro0-armhf-rb/etc/sudoers.d/jenkins
+++ b/hosts/cbxi4pro0-armhf-rb/etc/sudoers.d/jenkins
@@ -11,7 +11,7 @@ jenkins ALL= \
/bin/rm -rf --one-file-system /chroots/*, \
/bin/rm -rf --one-file-system /schroots/*, \
/bin/rm -rf --one-file-system /srv/live-build/*, \
- /bin/rm -rvf --one-file-system /srv/workspace/pbuilder/*, \
+ /bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
/bin/cp -v *.iso /srv/live-build/results/*, \
/bin/mv /chroots/* /schroots/*, \
/bin/mv /schroots/* /schroots/*, \
diff --git a/hosts/hb0-armhf-rb/etc/sudoers.d/jenkins b/hosts/hb0-armhf-rb/etc/sudoers.d/jenkins
index 7c907aec..2dab2ae5 100644
--- a/hosts/hb0-armhf-rb/etc/sudoers.d/jenkins
+++ b/hosts/hb0-armhf-rb/etc/sudoers.d/jenkins
@@ -11,7 +11,7 @@ jenkins ALL= \
/bin/rm -rf --one-file-system /chroots/*, \
/bin/rm -rf --one-file-system /schroots/*, \
/bin/rm -rf --one-file-system /srv/live-build/*, \
- /bin/rm -rvf --one-file-system /srv/workspace/pbuilder/*, \
+ /bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
/bin/cp -v *.iso /srv/live-build/results/*, \
/bin/mv /chroots/* /schroots/*, \
/bin/mv /schroots/* /schroots/*, \
diff --git a/hosts/jenkins/etc/sudoers.d/jenkins b/hosts/jenkins/etc/sudoers.d/jenkins
index 7c907aec..2dab2ae5 100644
--- a/hosts/jenkins/etc/sudoers.d/jenkins
+++ b/hosts/jenkins/etc/sudoers.d/jenkins
@@ -11,7 +11,7 @@ jenkins ALL= \
/bin/rm -rf --one-file-system /chroots/*, \
/bin/rm -rf --one-file-system /schroots/*, \
/bin/rm -rf --one-file-system /srv/live-build/*, \
- /bin/rm -rvf --one-file-system /srv/workspace/pbuilder/*, \
+ /bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
/bin/cp -v *.iso /srv/live-build/results/*, \
/bin/mv /chroots/* /schroots/*, \
/bin/mv /schroots/* /schroots/*, \
diff --git a/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins b/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins
index 7c907aec..2dab2ae5 100644
--- a/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins
+++ b/hosts/profitbricks-build1-amd64/etc/sudoers.d/jenkins
@@ -11,7 +11,7 @@ jenkins ALL= \
/bin/rm -rf --one-file-system /chroots/*, \
/bin/rm -rf --one-file-system /schroots/*, \
/bin/rm -rf --one-file-system /srv/live-build/*, \
- /bin/rm -rvf --one-file-system /srv/workspace/pbuilder/*, \
+ /bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
/bin/cp -v *.iso /srv/live-build/results/*, \
/bin/mv /chroots/* /schroots/*, \
/bin/mv /schroots/* /schroots/*, \
diff --git a/hosts/profitbricks-build2-amd64/etc/sudoers.d/jenkins b/hosts/profitbricks-build2-amd64/etc/sudoers.d/jenkins
index 7c907aec..2dab2ae5 100644
--- a/hosts/profitbricks-build2-amd64/etc/sudoers.d/jenkins
+++ b/hosts/profitbricks-build2-amd64/etc/sudoers.d/jenkins
@@ -11,7 +11,7 @@ jenkins ALL= \
/bin/rm -rf --one-file-system /chroots/*, \
/bin/rm -rf --one-file-system /schroots/*, \
/bin/rm -rf --one-file-system /srv/live-build/*, \
- /bin/rm -rvf --one-file-system /srv/workspace/pbuilder/*, \
+ /bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
/bin/cp -v *.iso /srv/live-build/results/*, \
/bin/mv /chroots/* /schroots/*, \
/bin/mv /schroots/* /schroots/*, \
diff --git a/hosts/profitbricks-build5-amd64/etc/sudoers.d/jenkins b/hosts/profitbricks-build5-amd64/etc/sudoers.d/jenkins
index 7c907aec..2dab2ae5 100644
--- a/hosts/profitbricks-build5-amd64/etc/sudoers.d/jenkins
+++ b/hosts/profitbricks-build5-amd64/etc/sudoers.d/jenkins
@@ -11,7 +11,7 @@ jenkins ALL= \
/bin/rm -rf --one-file-system /chroots/*, \
/bin/rm -rf --one-file-system /schroots/*, \
/bin/rm -rf --one-file-system /srv/live-build/*, \
- /bin/rm -rvf --one-file-system /srv/workspace/pbuilder/*, \
+ /bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
/bin/cp -v *.iso /srv/live-build/results/*, \
/bin/mv /chroots/* /schroots/*, \
/bin/mv /schroots/* /schroots/*, \
diff --git a/hosts/profitbricks-build6-amd64/etc/sudoers.d/jenkins b/hosts/profitbricks-build6-amd64/etc/sudoers.d/jenkins
index 7c907aec..2dab2ae5 100644
--- a/hosts/profitbricks-build6-amd64/etc/sudoers.d/jenkins
+++ b/hosts/profitbricks-build6-amd64/etc/sudoers.d/jenkins
@@ -11,7 +11,7 @@ jenkins ALL= \
/bin/rm -rf --one-file-system /chroots/*, \
/bin/rm -rf --one-file-system /schroots/*, \
/bin/rm -rf --one-file-system /srv/live-build/*, \
- /bin/rm -rvf --one-file-system /srv/workspace/pbuilder/*, \
+ /bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
/bin/cp -v *.iso /srv/live-build/results/*, \
/bin/mv /chroots/* /schroots/*, \
/bin/mv /schroots/* /schroots/*, \
diff --git a/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins b/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins
index 7c907aec..2dab2ae5 100644
--- a/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins
+++ b/hosts/wbq0-armhf-rb/etc/sudoers.d/jenkins
@@ -11,7 +11,7 @@ jenkins ALL= \
/bin/rm -rf --one-file-system /chroots/*, \
/bin/rm -rf --one-file-system /schroots/*, \
/bin/rm -rf --one-file-system /srv/live-build/*, \
- /bin/rm -rvf --one-file-system /srv/workspace/pbuilder/*, \
+ /bin/rm -rf --one-file-system /srv/workspace/pbuilder/*, \
/bin/cp -v *.iso /srv/live-build/results/*, \
/bin/mv /chroots/* /schroots/*, \
/bin/mv /schroots/* /schroots/*, \