chore: reorganize leaderboard tasks

Signed-off-by: Gerard Vanloo <gerard.vanloo@ibm.com>

Author: Red-GV

sre/roles/leaderboard/tasks/create_status.yaml

@@ -1,20 +1,20 @@
 ---
 - name: Create leaderboard status content
   ansible.builtin.set_fact:
-    leaderboard_current_status:
+    leaderboard_initial_status:
       events: []
-    leaderboard_legacy_status:
+    leaderboard_initial_assertion:
       status:
         conditions: []
 
-- name: Create status file in legacy format
+- name: Create assertion file
   ansible.builtin.copy:
-    content: "{{ leaderboard_legacy_status | to_nice_json(indent=2) }}"
+    content: "{{ leaderboard_initial_assertion | to_nice_json(indent=2) }}"
     dest: "/tmp/assertion.json"
     mode: "0644"
 
-- name: Create status file in v1 format
+- name: Create status file
   ansible.builtin.copy:
-    content: "{{ leaderboard_current_status | to_nice_json }}"
+    content: "{{ leaderboard_initial_status | to_nice_json }}"
     dest: "/tmp/status.json"
     mode: "0644"

sre/roles/leaderboard/tasks/main.yaml

@@ -5,17 +5,30 @@
   tags:
     - install_tools
 
-- name: Verify that the status file exists
+- name: Load assertion file contents
   ansible.builtin.set_fact:
-    leaderboard_current_status_exists: "{{ '/tmp/status.json' is exists }}"
-    leaderboard_legacy_status_exists: "{{ '/tmp/assertion.json' is exists }}"
+    leaderboard_current_assertion: "{{ lookup('ansible.builtin.file', '/tmp/assertion.json') | from_json }}"
   tags:
     - always
+  vars:
+    leaderboard_current_assertion_exists: "{{ '/tmp/assertion.json' is exists }}"
+  when:
+    - leaderboard_current_assertion_exists
 
-- name: Perform update tasks
+- name: Load status file contents
+  ansible.builtin.set_fact:
+    leaderboard_current_status: "{{ lookup('ansible.builtin.file', '/tmp/status.json') | from_json }}"
+  tags:
+    - always
+  vars:
+    leaderboard_current_status_exists: "{{ '/tmp/status.json' is exists }}"
   when:
     - leaderboard_current_status_exists
-    - leaderboard_legacy_status_exists
+
+- name: Perform update tasks
+  when:
+    - leaderboard_current_assertion is defined
+    - leaderboard_current_status is defined
   block:
     - name: Import status file update tasks
       ansible.builtin.import_tasks:
@@ -64,14 +77,40 @@
         file: update_status_uninstall_tools.yaml
       tags:
         - uninstall_tools
+
+    - name: Update assertion file with new condition
+      ansible.builtin.copy:
+        content: |
+          {{
+            leaderboard_current_assertion |
+            combine({'status': {'conditions': leaderboard_status_conditions}}) |
+            to_nice_json(indent=2)
+          }}
+        dest: "/tmp/assertion.json"
+        mode: "0644"
+      tags:
+        - always
+      when:
+        - leaderboard_status.status != 'progressing'
+        - leaderboard_status_conditions is defined
+
+    - name: Update status file with new event
+      ansible.builtin.copy:
+        content: "{{ leaderboard_current_status | combine({'events': leaderboard_status_events}) | to_nice_json }}"
+        dest: "/tmp/status.json"
+        mode: "0644"
+      tags:
+        - always
   always:
-    - name: Copy legacy status into local directory
+    - name: Copy assertion file into local directory
       ansible.builtin.copy:
-        dest: "{{ recorders_storage.local.directory }}/assertion.json"
+        dest: "{{ leaderboard_storage.local.directory }}/assertion.json"
         mode: "0644"
         src: /tmp/assertion.json
+      when:
+        - leaderboard_storage.local is defined
 
-    - name: Upload legacy status to S3 bucket
+    - name: Upload assertion file to S3 bucket
       amazon.aws.s3_object:
         endpoint_url: "{{ leaderboard_storage.s3.endpoint }}"
         bucket: "{{ leaderboard_storage.s3.bucket }}"
@@ -81,13 +120,15 @@
       when:
         - leaderboard_storage.s3 is defined
 
-    - name: Copy status into local directory
+    - name: Copy status file into local directory
       ansible.builtin.copy:
-        dest: "{{ recorders_storage.local.directory }}/status.json"
+        dest: "{{ leaderboard_storage.local.directory }}/status.json"
         mode: "0644"
         src: /tmp/status.json
+      when:
+        - leaderboard_storage.local is defined
 
-    - name: Upload v1 status to S3 bucket
+    - name: Upload status file to S3 bucket
       amazon.aws.s3_object:
         endpoint_url: "{{ leaderboard_storage.s3.endpoint }}"
         bucket: "{{ leaderboard_storage.s3.bucket }}"

sre/roles/leaderboard/tasks/update_status_inject_faults.yaml

@@ -1,12 +1,7 @@
 ---
-- name: Load status file(s)
-  ansible.builtin.set_fact:
-    leaderboard_current_status: "{{ lookup('ansible.builtin.file', '/tmp/status.json') | from_json }}"
-    leaderboard_legacy_status: "{{ lookup('ansible.builtin.file', '/tmp/assertion.json') | from_json }}"
-
 - name: Update status
   ansible.builtin.set_fact:
-    leaderboard_status_conditions: "{{ leaderboard_legacy_status.status.conditions + [status_condition] }}"
+    leaderboard_status_conditions: "{{ leaderboard_current_assertion.status.conditions + [status_condition] }}"
     leaderboard_status_events: "{{ leaderboard_current_status.events + [status_event] }}"
   vars:
     status_condition:
@@ -17,22 +12,4 @@
       phase: fault-injection
       status: "{{ leaderboard_status.status }}"
       task: "{{ leaderboard_status.failed_task | default(omit) }}"
-
-- name: Update status file in legacy format
-  ansible.builtin.copy:
-    content: |
-      {{
-        leaderboard_legacy_status |
-        combine({'status': {'conditions': leaderboard_status_conditions}}) |
-        to_nice_json(indent=2)
-      }}
-    dest: "/tmp/assertion.json"
-    mode: "0644"
-  when:
-    - leaderboard_status.status != 'progressing'
-
-- name: Update status file in v1 format
-  ansible.builtin.copy:
-    content: "{{ leaderboard_current_status | combine({'events': leaderboard_status_events}) | to_nice_json }}"
-    dest: "/tmp/status.json"
-    mode: "0644"
+      timestamp: "{{ now(utc=True, fmt='%Y-%m-%dT%H:%M:%SZ') }}"

sre/roles/leaderboard/tasks/update_status_install_applications.yaml

@@ -1,12 +1,7 @@
 ---
-- name: Load status file(s)
-  ansible.builtin.set_fact:
-    leaderboard_current_status: "{{ lookup('ansible.builtin.file', '/tmp/status.json') | from_json }}"
-    leaderboard_legacy_status: "{{ lookup('ansible.builtin.file', '/tmp/assertion.json') | from_json }}"
-
 - name: Update status
   ansible.builtin.set_fact:
-    leaderboard_status_conditions: "{{ leaderboard_legacy_status.status.conditions + [status_condition] }}"
+    leaderboard_status_conditions: "{{ leaderboard_current_assertion.status.conditions + [status_condition] }}"
     leaderboard_status_events: "{{ leaderboard_current_status.events + [status_event] }}"
   vars:
     status_condition:
@@ -17,22 +12,4 @@
       phase: application-installation
       status: "{{ leaderboard_status.status }}"
       task: "{{ leaderboard_status.failed_task | default(omit) }}"
-
-- name: Update status file in legacy format
-  ansible.builtin.copy:
-    content: |
-      {{
-        leaderboard_legacy_status |
-        combine({'status': {'conditions': leaderboard_status_conditions}}) |
-        to_nice_json(indent=2)
-      }}
-    dest: "/tmp/assertion.json"
-    mode: "0644"
-  when:
-    - leaderboard_status.status != 'progressing'
-
-- name: Update status file in v1 format
-  ansible.builtin.copy:
-    content: "{{ leaderboard_current_status | combine({'events': leaderboard_status_events}) | to_nice_json }}"
-    dest: "/tmp/status.json"
-    mode: "0644"
+      timestamp: "{{ now(utc=True, fmt='%Y-%m-%dT%H:%M:%SZ') }}"

sre/roles/leaderboard/tasks/update_status_install_recorders.yaml

@@ -1,8 +1,4 @@
 ---
-- name: Load status file(s)
-  ansible.builtin.set_fact:
-    leaderboard_current_status: "{{ lookup('ansible.builtin.file', '/tmp/status.json') | from_json }}"
-
 - name: Update status
   ansible.builtin.set_fact:
     leaderboard_status_events: "{{ leaderboard_current_status.events + [status_event] }}"
@@ -11,9 +7,4 @@
       phase: recorder-installation
       status: "{{ leaderboard_status.status }}"
       task: "{{ leaderboard_status.failed_task | default(omit) }}"
-
-- name: Update status file in v1 format
-  ansible.builtin.copy:
-    content: "{{ leaderboard_current_status | combine({'events': leaderboard_status_events}) | to_nice_json }}"
-    dest: "/tmp/assertion.json"
-    mode: "0644"
+      timestamp: "{{ now(utc=True, fmt='%Y-%m-%dT%H:%M:%SZ') }}"

sre/roles/leaderboard/tasks/update_status_install_tools.yaml

@@ -1,8 +1,4 @@
 ---
-- name: Load status file(s)
-  ansible.builtin.set_fact:
-    leaderboard_current_status: "{{ lookup('ansible.builtin.file', '/tmp/status.json') | from_json }}"
-
 - name: Update status
   ansible.builtin.set_fact:
     leaderboard_status_events: "{{ leaderboard_current_status.events + [status_event] }}"
@@ -11,9 +7,4 @@
       phase: tool-installation
       status: "{{ leaderboard_status.status }}"
       task: "{{ leaderboard_status.failed_task | default(omit) }}"
-
-- name: Update status file in v1 format
-  ansible.builtin.copy:
-    content: "{{ leaderboard_current_status | combine({'events': leaderboard_status_events}) | to_nice_json }}"
-    dest: "/tmp/status.json"
-    mode: "0644"
+      timestamp: "{{ now(utc=True, fmt='%Y-%m-%dT%H:%M:%SZ') }}"

sre/roles/leaderboard/tasks/update_status_remove_faults.yaml

@@ -1,8 +1,4 @@
 ---
-- name: Load status file(s)
-  ansible.builtin.set_fact:
-    leaderboard_current_status: "{{ lookup('ansible.builtin.file', '/tmp/status.json') | from_json }}"
-
 - name: Update status
   ansible.builtin.set_fact:
     leaderboard_status_events: "{{ leaderboard_current_status.events + [status_event] }}"
@@ -11,9 +7,4 @@
       phase: fault-removal
       status: "{{ leaderboard_status.status }}"
       task: "{{ leaderboard_status.failed_task | default(omit) }}"
-
-- name: Update status file in v1 format
-  ansible.builtin.copy:
-    content: "{{ leaderboard_current_status | combine({'events': leaderboard_status_events}) | to_nice_json }}"
-    dest: "/tmp/status.json"
-    mode: "0644"
+      timestamp: "{{ now(utc=True, fmt='%Y-%m-%dT%H:%M:%SZ') }}"

sre/roles/leaderboard/tasks/update_status_uninstall_applications.yaml

@@ -1,8 +1,4 @@
 ---
-- name: Load status file(s)
-  ansible.builtin.set_fact:
-    leaderboard_current_status: "{{ lookup('ansible.builtin.file', '/tmp/status.json') | from_json }}"
-
 - name: Update status
   ansible.builtin.set_fact:
     leaderboard_status_events: "{{ leaderboard_current_status.events + [status_event] }}"
@@ -11,9 +7,4 @@
       phase: application-uninstallation
       status: "{{ leaderboard_status.status }}"
       task: "{{ leaderboard_status.failed_task | default(omit) }}"
-
-- name: Update status file in v1 format
-  ansible.builtin.copy:
-    content: "{{ leaderboard_current_status | combine({'events': leaderboard_status_events}) | to_nice_json }}"
-    dest: "/tmp/status.json"
-    mode: "0644"
+      timestamp: "{{ now(utc=True, fmt='%Y-%m-%dT%H:%M:%SZ') }}"

sre/roles/leaderboard/tasks/update_status_uninstall_recorders.yaml

@@ -1,8 +1,4 @@
 ---
-- name: Load status file(s)
-  ansible.builtin.set_fact:
-    leaderboard_current_status: "{{ lookup('ansible.builtin.file', '/tmp/status.json') | from_json }}"
-
 - name: Update status
   ansible.builtin.set_fact:
     leaderboard_status_events: "{{ leaderboard_current_status.events + [status_event] }}"
@@ -11,9 +7,4 @@
       phase: recorder-uninstallation
       status: "{{ leaderboard_status.status }}"
       task: "{{ leaderboard_status.failed_task | default(omit) }}"
-
-- name: Update status file in v1 format
-  ansible.builtin.copy:
-    content: "{{ leaderboard_current_status | combine({'events': leaderboard_status_events}) | to_nice_json }}"
-    dest: "/tmp/status.json"
-    mode: "0644"
+      timestamp: "{{ now(utc=True, fmt='%Y-%m-%dT%H:%M:%SZ') }}"

sre/roles/leaderboard/tasks/update_status_uninstall_tools.yaml

@@ -1,12 +1,7 @@
 ---
-- name: Load status file(s)
-  ansible.builtin.set_fact:
-    leaderboard_current_status: "{{ lookup('ansible.builtin.file', '/tmp/status.json') | from_json }}"
-    leaderboard_legacy_status: "{{ lookup('ansible.builtin.file', '/tmp/assertion.json') | from_json }}"
-
 - name: Update status
   ansible.builtin.set_fact:
-    leaderboard_status_conditions: "{{ leaderboard_legacy_status.status.conditions + [status_condition] }}"
+    leaderboard_status_conditions: "{{ leaderboard_current_assertion.status.conditions + [status_condition] }}"
     leaderboard_status_events: "{{ leaderboard_current_status.events + [status_event] }}"
   vars:
     status_condition:
@@ -17,22 +12,4 @@
       phase: tool-uninstallation
       status: "{{ leaderboard_status.status }}"
       task: "{{ leaderboard_status.failed_task | default(omit) }}"
-
-- name: Update status file in legacy format
-  ansible.builtin.copy:
-    content: |
-      {{
-        leaderboard_legacy_status |
-        combine({'status': {'conditions': leaderboard_status_conditions}}) |
-        to_nice_json(indent=2)
-      }}
-    dest: "/tmp/assertion.json"
-    mode: "0644"
-  when:
-    - leaderboard_status.status != 'progressing'
-
-- name: Update status file in v1 format
-  ansible.builtin.copy:
-    content: "{{ leaderboard_current_status | combine({'events': leaderboard_status_events}) | to_nice_json }}"
-    dest: "/tmp/status.json"
-    mode: "0644"
+      timestamp: "{{ now(utc=True, fmt='%Y-%m-%dT%H:%M:%SZ') }}"