Update cleanups for base and base-minimal

This is the followup to the parent change that makes the same cleanup
modifications to base and base-minimal jobs. The justification is the
same: fix a deprecation warning and improve logging and reliability of
the cleanup run. We have split things up to enable testing to ensure we
don't accidentally break the world due to changing the base job.

Change-Id: I6589c185f6071932c6955223ffcbed8d3490fed6

playbooks/base-minimal/cleanup.yaml

@@ -1,16 +1,6 @@
 - hosts: all
-  tasks:
-    - name: Gather debug info on job fail
-      when: not (zuul_success | bool)
-      block:
-        - name: get df disk usage
-          raw: timeout -k 5 90 df
-
-        - name: get df inode usage
-          raw: timeout -k 5 90 df -i
-
-        - name: get l2 networking
-          raw: timeout -k 5 90 ip link
-
-        - name: get l3 networking
-          raw: timeout -k 5 90 ip addr
+  # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
+  # successful jobs.
+  ignore_errors: yes
+  roles:
+    - remove-build-sshkey

playbooks/base-minimal/post.yaml

@@ -2,10 +2,22 @@
   roles:
     - fetch-output
     - merge-output-to-logs
+  tasks:
+    - name: Gather debug info on job fail
+      when: not (zuul_success | bool)
+      block:
+        - name: get df disk usage
+          raw: timeout -k 5 90 df
+          failed_when: false
 
-- hosts: all
-  # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
-  # successful jobs.
-  ignore_errors: yes
-  roles:
-    - remove-build-sshkey
+        - name: get df inode usage
+          raw: timeout -k 5 90 df -i
+          failed_when: false
+
+        - name: get l2 networking
+          raw: timeout -k 5 90 ip link
+          failed_when: false
+
+        - name: get l3 networking
+          raw: timeout -k 5 90 ip addr
+          failed_when: false

playbooks/base/cleanup.yaml

@@ -1,16 +1,6 @@
 - hosts: all
-  tasks:
-    - name: Gather debug info on job fail
-      when: not (zuul_success | bool)
-      block:
-        - name: get df disk usage
-          raw: timeout -k 5 90 df
-
-        - name: get df inode usage
-          raw: timeout -k 5 90 df -i
-
-        - name: get l2 networking
-          raw: timeout -k 5 90 ip link
-
-        - name: get l3 networking
-          raw: timeout -k 5 90 ip addr
+  # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
+  # successful jobs.
+  ignore_errors: yes
+  roles:
+    - remove-build-sshkey

playbooks/base/post.yaml

@@ -2,10 +2,22 @@
   roles:
     - fetch-output
     - merge-output-to-logs
+  tasks:
+    - name: Gather debug info on job fail
+      when: not (zuul_success | bool)
+      block:
+        - name: get df disk usage
+          raw: timeout -k 5 90 df
+          failed_when: false
 
-- hosts: all
-  # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
-  # successful jobs.
-  ignore_errors: yes
-  roles:
-    - remove-build-sshkey
+        - name: get df inode usage
+          raw: timeout -k 5 90 df -i
+          failed_when: false
+
+        - name: get l2 networking
+          raw: timeout -k 5 90 ip link
+          failed_when: false
+
+        - name: get l3 networking
+          raw: timeout -k 5 90 ip addr
+          failed_when: false

zuul.d/jobs.yaml

@@ -52,8 +52,9 @@
     pre-run: playbooks/base/pre.yaml
     post-run:
       - playbooks/base/post.yaml
+      - name: playbooks/base/cleanup.yaml
+        cleanup: true
       - playbooks/base/post-logs.yaml
-    cleanup-run: playbooks/base/cleanup.yaml
     roles:
       - zuul: zuul/zuul-jobs
     timeout: 1800
@@ -106,8 +107,9 @@
     pre-run: playbooks/base-minimal/pre.yaml
     post-run:
       - playbooks/base-minimal/post.yaml
+      - name: playbooks/base-minimal/cleanup.yaml
+        cleanup: true
       - playbooks/base-minimal/post-logs.yaml
-    cleanup-run: playbooks/base-minimal/cleanup.yaml
     roles:
       - zuul: zuul/zuul-jobs
     timeout: 1800