Use modern cleanup tooling in base-test

Zuul 11.0.0 deprecated the cleanup-run attribute for jobs and folded it
into post-run with a special flag on the playbook. This change converts
to the new format to cleanup a deprecation warning. We also take
advantage of the new behavior to rearrange when things run relative to
log collection so that we can log the stats collection in the cleanup
run.

Finally to have the cleanup playbook execture successfully we move the
ssh key removal into the cleanup playbook instead of the post playbook.
Otherwise the keys won't be available for ssh during the cleanup
playbook. This match the zuul-base-job examples more closely.

Note we only make these changes on base-test to start in order to check
things before we affect all jobs. The followup change modifies the other
base jobs and will be landed after this one checks out ok.

Change-Id: I639691f12adc8a5dcebdbe23693765e42548aaaf

playbooks/base-test/cleanup.yaml

@@ -14,3 +14,10 @@
 
         - name: get l3 networking
           raw: timeout -k 5 90 ip addr
+
+- hosts: all
+  # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
+  # successful jobs.
+  ignore_errors: yes
+  roles:
+    - remove-build-sshkey

playbooks/base-test/post.yaml

@@ -2,10 +2,3 @@
   roles:
     - fetch-output
     - merge-output-to-logs
-
-- hosts: all
-  # NOTE(pabelanger): We ignore_errors for the following tasks as not to fail
-  # successful jobs.
-  ignore_errors: yes
-  roles:
-    - remove-build-sshkey

zuul.d/jobs.yaml

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