From c7467f022874eb62e0fde888f5fc089727b28a9e Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun, 8 Apr 2018 14:59:17 +0200
Subject: [PATCH] buildd: remove buildd-schroot-aptitude-kill.squeeze

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
---
 .../buildd-schroot-aptitude-kill.squeeze      | 14 -------------
 modules/buildd/manifests/init.pp              | 20 +++++++------------
 2 files changed, 7 insertions(+), 27 deletions(-)
 delete mode 100644 modules/buildd/files/buildd-schroot-aptitude-kill.squeeze

diff --git a/modules/buildd/files/buildd-schroot-aptitude-kill.squeeze b/modules/buildd/files/buildd-schroot-aptitude-kill.squeeze
deleted file mode 100644
index 0be841f69..000000000
--- a/modules/buildd/files/buildd-schroot-aptitude-kill.squeeze
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-schroots=$(pgrep -x -u 0 schroot -d ',')
-pgrep -x -u 0 -P "$schroots" aptitude | xargs --no-run-if-empty ps h -o 'pid,vsz,cputime' | while read pid vsz cputime; do
-  mb=$((vsz/1024))
-  [ "$mb" -lt 250 ] && continue
-  hours=${vsz%%:*}
-  nohours=${vsz#*:}
-  mins=${nohours%:*}
-
-  if [ "$hours" -gt 0 ] || [ "$mins" -gt 15 ]; then
-    kill "$pid"
-  fi
-done
diff --git a/modules/buildd/manifests/init.pp b/modules/buildd/manifests/init.pp
index 1d9aa2065..4b8e397bd 100644
--- a/modules/buildd/manifests/init.pp
+++ b/modules/buildd/manifests/init.pp
@@ -82,20 +82,14 @@ class buildd ($ensure=present) {
 			require => Package['debian.org']
 		}
 
-		if ($::kernel == 'Linux') {
-			package { 'python-psutil':
-				ensure => installed,
-			}
-			file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-				source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
-				mode    => '0555',
-			}
-		} else {
-			file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
-				source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill.squeeze',
-				mode    => '0555',
-			}
+		package { 'python-psutil':
+			ensure => installed,
 		}
+		file { '/usr/local/sbin/buildd-schroot-aptitude-kill':
+			source  => 'puppet:///modules/buildd/buildd-schroot-aptitude-kill',
+			mode    => '0555',
+		}
+
 		file { '/etc/cron.d/puppet-buildd-aptitude': ensure => absent }
 		concat::fragment { 'dsa-puppet-stuff--buildd-aptitude-killer':
 			target => '/etc/cron.d/dsa-puppet-stuff',
-- 
2.20.1