CI: Move "make clean" into cleanup phase

This will allow to debug a broken installation via a held node.

Signed-off-by: Dr. Jens Harbott <[email protected]>

Author: osfrickler

.zuul.yaml

@@ -34,6 +34,7 @@
     nodeset: testbed-orchestrator
     run: playbooks/deploy.yml
     post-run: playbooks/post.yml
+    cleanup-run: playbooks/cleanup.yml
     required-projects:
       - osism/ansible-collection-commons
       - osism/ansible-collection-services

playbooks/cleanup.yml

@@ -0,0 +1,22 @@
+---
+- name: Cleanup play
+  hosts: all
+
+  vars_files:
+    - vars/cloud_envs.yml
+
+  tasks:
+    - name: Set cloud_env fact (Zuul deployment)
+      ansible.builtin.set_fact:
+        cloud_env: "{{ cloud_envs[hostvars[groups['all'][0]]['nodepool']['label']] }}"
+      when: "'nodepool' in hostvars[groups['all'][0]]"
+
+    - name: Set cloud_env fact (local deployment)
+      ansible.builtin.set_fact:
+        cloud_env: "{{ testbed_environment | default('ci') }}"
+      when: "'nodepool' not in hostvars[groups['all'][0]]"
+
+    - name: Make clean
+      ansible.builtin.shell:
+        chdir: "{{ ansible_user_dir }}/src/github.com/osism/testbed/terraform"
+        cmd: make ENVIRONMENT={{ cloud_env }} clean 2>&1

playbooks/post.yml

@@ -1,26 +1,4 @@
 ---
-- name: Post clean play
-  hosts: all
-
-  vars_files:
-    - vars/cloud_envs.yml
-
-  tasks:
-    - name: Set cloud_env fact (Zuul deployment)
-      ansible.builtin.set_fact:
-        cloud_env: "{{ cloud_envs[hostvars[groups['all'][0]]['nodepool']['label']] }}"
-      when: "'nodepool' in hostvars[groups['all'][0]]"
-
-    - name: Set cloud_env fact (local deployment)
-      ansible.builtin.set_fact:
-        cloud_env: "{{ testbed_environment | default('ci') }}"
-      when: "'nodepool' not in hostvars[groups['all'][0]]"
-
-    - name: Make clean
-      ansible.builtin.shell:
-        chdir: "{{ ansible_user_dir }}/src/github.com/osism/testbed/terraform"
-        cmd: make ENVIRONMENT={{ cloud_env }} clean 2>&1
-
 - name: Post output play
   hosts: all