From 5bcd1f8d7b25305e55fc50380a79f10d9e8324c4 Mon Sep 17 00:00:00 2001
From: Jeff Grafton <jgrafton@google.com>
Date: Tue, 12 Apr 2016 16:12:20 -0700
Subject: [PATCH] Rename "gcloud-update" jobs to "daily-maintenace" and add
 Docker cleanup

---
 ...pdate.yaml => jenkins-daily-maintenance.yaml} | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)
 rename hack/jenkins/job-configs/{jenkins-gcloud-update.yaml => jenkins-daily-maintenance.yaml} (76%)

diff --git a/hack/jenkins/job-configs/jenkins-gcloud-update.yaml b/hack/jenkins/job-configs/jenkins-daily-maintenance.yaml
similarity index 76%
rename from hack/jenkins/job-configs/jenkins-gcloud-update.yaml
rename to hack/jenkins/job-configs/jenkins-daily-maintenance.yaml
index 960dcb6c3cf..ac75958832e 100644
--- a/hack/jenkins/job-configs/jenkins-gcloud-update.yaml
+++ b/hack/jenkins/job-configs/jenkins-daily-maintenance.yaml
@@ -1,6 +1,6 @@
 - job:
-    name: 'jenkins-gcloud-update'
-    description: 'Run gcloud components update. Test owner: spxtr.'
+    name: 'jenkins-daily-maintenance'
+    description: 'Run gcloud components update and clean Docker images. Test owner: spxtr.'
     logrotate:
         numToKeep: 200
     builders:
@@ -9,14 +9,18 @@
             gcloud components update
             gcloud components update alpha
             gcloud components update beta
+            # Copied from http://blog.yohanliyanage.com/2015/05/docker-clean-up-after-yourself/
+            docker rm -v $(docker ps -a -q -f 'status=exited' -f 'status=dead') || true
+            docker rmi $(docker images -q -f 'dangling=true') || true
+            docker run -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker:/var/lib/docker --rm martin/docker-cleanup-volumes
 
 - job:
-    name: 'jenkins-gcloud-update-all'
-    description: 'Update gcloud components on all nodes. Test owner: spxtr.'
+    name: 'jenkins-daily-maintenance-all'
+    description: 'Run jenkins-daily-maintenance on all nodes. Test owner: spxtr.'
     logrotate:
         numToKeep: 200
     builders:
-        # Run jenkins-gcloud-update on all nodes.
+        # Run jenkins-daily-maintenance on all nodes.
         - raw:
             xml: |
                 <hudson.plugins.parameterizedtrigger.TriggerBuilder plugin="parameterized-trigger@2.29">
@@ -26,7 +30,7 @@
                             <configFactories>
                                 <org.jvnet.jenkins.plugins.nodelabelparameter.parameterizedtrigger.AllNodesBuildParameterFactory plugin="nodelabelparameter@1.7"/>
                             </configFactories>
-                            <projects>jenkins-gcloud-update</projects>
+                            <projects>jenkins-daily-maintenance</projects>
                             <condition>ALWAYS</condition>
                             <triggerWithNoParameters>false</triggerWithNoParameters>
                             <block>