[Qa-jenkins-scm] [jenkins.debian.net] 01/01: remove more calamaris stuff

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository jenkins.debian.net.

commit 84edda481ca8e15be3375c50f5054e6d270b2edb
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sat Apr 7 11:06:22 2018 +0200

    remove more calamaris stuff
    
    this includes removing the self_sub-maintenance-squid job that went on
    for 3+ years reporting the same 3+ years old data.
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 TODO4stretch-host-upgrades.txt |  1 -
 bin/maintenance.sh             | 12 ------------
 debian/control                 |  2 +-
 job-cfg/self.yaml              |  6 ------
 4 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/TODO4stretch-host-upgrades.txt b/TODO4stretch-host-upgrades.txt
index ed011af..67fdfac 100644
--- a/TODO4stretch-host-upgrades.txt
+++ b/TODO4stretch-host-upgrades.txt
@@ -4,7 +4,6 @@ kept the jessie versions:
 	Configuration file '/etc/default/shorewall'
 	Configuration file '/etc/shorewall/shorewall.conf'
 	Configuration file '/etc/shorewall6/shorewall6.conf'
-	Configuration file '/etc/calamaris/calamaris.conf'
 	Configuration file '/etc/apache2/conf-available/security.conf'
 
 
diff --git a/bin/maintenance.sh b/bin/maintenance.sh
index 41c166b..4654044 100755
--- a/bin/maintenance.sh
+++ b/bin/maintenance.sh
@@ -122,15 +122,6 @@ report_filetype_usage() {
 	rm $OUTPUT
 }
 
-report_squid_usage() {
-	REPORT=/var/www/calamaris/calamaris.txt
-	if [ -z $1 ] ; then
-		cat $REPORT
-	else
-		head -31 $REPORT
-	fi
-}
-
 wait4idle() {
 	echo "Waiting until no $1.sh process runs.... $(date)"
 	while [ $(ps fax | grep -c $1.sh) -gt 1 ] ; do
@@ -167,7 +158,6 @@ general_maintenance() {
 if [ -z $1 ] ; then
 	general_maintenance
 	compress_old_jenkins_logs
-	report_squid_usage brief
 else
 	case $1 in
 		chroot-installation*)		wait4idle $1
@@ -198,8 +188,6 @@ else
 						;;
 		d-i)				report_old_directories /srv/d-i 7 /srv/d-i/workspace /srv/d-i/isos
 						;;
-		squid)				report_squid_usage
-						;;
 		rebootstrap)			remove_old_rebootstrap_logs
 						;;
 		*)				;;
diff --git a/debian/control b/debian/control
index fb399e7..b29b740 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: https://anonscm.debian.org/git/qa/jenkins.debian.net.git
 Package: jenkins.debian.net-setup
 Architecture: all
 Depends: ${misc:Depends}, jenkins.debian.net-bin, 
- vim, screen, less, etckeeper, moreutils, curl, mtr-tiny, dstat, devscripts, bash-completion, shorewall, shorewall6, cron-apt, apt-listchanges, munin, calamaris, procmail, libjson-rpc-perl, libfile-touch-perl, zutils, ip2host, apache2, python-yaml, python-pip,
+ vim, screen, less, etckeeper, moreutils, curl, mtr-tiny, dstat, devscripts, bash-completion, shorewall, shorewall6, cron-apt, apt-listchanges, munin, procmail, libjson-rpc-perl, libfile-touch-perl, zutils, ip2host, apache2, python-yaml, python-pip,
  build-essential, python-setuptools
 Recommends: jenkins-job-builder
 Description: Stuff to setup a jenkins.debian.net instance
diff --git a/job-cfg/self.yaml b/job-cfg/self.yaml
index 87b2fe4..34c36da 100644
--- a/job-cfg/self.yaml
+++ b/job-cfg/self.yaml
@@ -44,10 +44,6 @@
 
 - job-template:
     defaults: self-maintenance
-    name: '{name}_sub-maintenance-squid'
-
-- job-template:
-    defaults: self-maintenance
     name: 'rebootstrap_maintenance'
 
 - project:
@@ -56,8 +52,6 @@
     jobs:
       - '{name}_maintenance':
          my_shell: '/srv/jenkins/bin/maintenance.sh'
-      - '{name}_sub-maintenance-squid':
-         my_shell: '/srv/jenkins/bin/maintenance.sh squid'
       - 'rebootstrap_maintenance':
          my_shell: '/srv/jenkins/bin/maintenance.sh rebootstrap'
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git