[container_benchmark] Deduplicate Ansible tasks for container benchmarks

Signed-off-by: Jan Rodák <[email protected]>

Author: Honny1

projects/container_bench/toolbox/container_bench_capture_container_engine_info/tasks/main.yaml

@@ -1,6 +1,5 @@
 ---
-# Define common command template
-- name: Set common command
+- name: Set info command
   set_fact:
     container_info_command: "{{ container_bench_capture_container_engine_info_binary_path }} {{ container_bench_capture_container_engine_info_additional_args }} info --format json"
 

projects/container_bench/toolbox/container_bench_capture_container_engine_info/tasks/unix.yml

@@ -1,12 +1,7 @@
 ---
-# Create artifacts directory
-- name: Create the artifacts directory
-  file:
-    path: "{{ artifact_extra_logs_dir }}/artifacts"
-    state: directory
-    mode: '0755'
+- name: Include shared artifacts directory creation
+  include_tasks: "../../shared_tasks/create_artifacts_dir.yml"
 
-# Capture container engine information
 - name: Capture the container engine information
   become: "{{ container_bench_capture_container_engine_info_rootfull }}"
   shell: |

projects/container_bench/toolbox/container_bench_capture_container_engine_info/tasks/windows.yml

@@ -1,11 +1,7 @@
 ---
-# Create artifacts directory
-- name: Create the artifacts directory
-  ansible.windows.win_file:
-    path: "{{ artifact_extra_logs_dir }}\\artifacts"
-    state: directory
+- name: Include shared artifacts directory creation
+  include_tasks: "../../shared_tasks/create_artifacts_dir.yml"
 
-# Capture container engine information
 - name: Capture the container engine information
   ansible.windows.win_shell: |
     $output = {{ container_info_command }}

projects/container_bench/toolbox/container_bench_capture_system_state/tasks/darwin.yml

@@ -1,11 +1,6 @@
 ---
-# Create artifacts directory
-- name: Create the artifacts directory
-  file:
-    path: "{{ artifact_extra_logs_dir }}/artifacts"
-    state: directory
-    mode: '0755'
+- name: Include shared artifacts directory creation
+  include_tasks: "../../shared_tasks/create_artifacts_dir.yml"
 
-# Capture system information - macOS/Darwin
 - name: Capture the system versions (macOS only)
   shell: system_profiler SPSoftwareDataType SPHardwareDataType > "{{ artifact_extra_logs_dir }}/artifacts/system_info.txt"

projects/container_bench/toolbox/container_bench_capture_system_state/tasks/linux.yml

@@ -1,12 +1,7 @@
 ---
-# Create artifacts directory
-- name: Create the artifacts directory
-  file:
-    path: "{{ artifact_extra_logs_dir }}/artifacts"
-    state: directory
-    mode: '0755'
+- name: Include shared artifacts directory creation
+  include_tasks: "../../shared_tasks/create_artifacts_dir.yml"
 
-# Capture system information - Linux
 - name: Capture the system information
   shell: |
     set -o pipefail

projects/container_bench/toolbox/container_bench_capture_system_state/tasks/windows.yml

@@ -1,11 +1,7 @@
 ---
-# Create artifacts directory
-- name: Create the artifacts directory
-  ansible.windows.win_file:
-    path: "{{ artifact_extra_logs_dir }}\\artifacts"
-    state: directory
+- name: Include shared artifacts directory creation
+  include_tasks: "../../shared_tasks/create_artifacts_dir.yml"
 
-# Capture system information - Windows
 - name: Capture the system information
   ansible.windows.win_shell: |
     # Create output file and add Software section header

projects/container_bench/toolbox/container_bench_exec_benchmark/tasks/main.yml

@@ -1,22 +1,32 @@
 ---
-# Define common command templates (shared across all platforms)
-- name: Set common commands
+- name: Validate required variables are defined
+  assert:
+    that:
+      - container_bench_exec_benchmark_exec_time_path is defined
+      - container_bench_exec_benchmark_binary_path is defined
+      - container_bench_exec_benchmark_rootfull is defined
+      - container_bench_exec_benchmark_additional_args is defined
+  when: false  # This task never runs but validates variable definitions
+
+- include_tasks: "../../shared_tasks/map_variables.yml"
+  vars:
+    role_name: "container_bench_exec_benchmark"
+
+- name: Set common commands (shared across all platforms)
   set_fact:
+    image_to_pull: "registry.fedoraproject.org/fedora:latest"
     prepare_commands: |
-      {{ container_bench_exec_benchmark_binary_path }} {{ container_bench_exec_benchmark_additional_args }} system prune -a -f
-      {{ container_bench_exec_benchmark_binary_path }} {{ container_bench_exec_benchmark_additional_args }} pull registry.fedoraproject.org/fedora:latest
-      {{ container_bench_exec_benchmark_binary_path }} {{ container_bench_exec_benchmark_additional_args }} run --name benchmark_exec -d registry.fedoraproject.org/fedora:latest sleep infinity
+      {{ binary_path }} {{ additional_args }} run --name benchmark_exec -d registry.fedoraproject.org/fedora:latest sleep infinity
     cleanup_commands: |
-      {{ container_bench_exec_benchmark_binary_path }} {{ container_bench_exec_benchmark_additional_args }} stop benchmark_exec
-      {{ container_bench_exec_benchmark_binary_path }} {{ container_bench_exec_benchmark_additional_args }} rm -f benchmark_exec
-      {{ container_bench_exec_benchmark_binary_path }} {{ container_bench_exec_benchmark_additional_args }} system prune -a -f
+      {{ binary_path }} {{ additional_args }} stop benchmark_exec
+      {{ binary_path }} {{ additional_args }} rm -f benchmark_exec
     benchmark_command: |
-      {{ container_bench_exec_benchmark_binary_path }} {{ container_bench_exec_benchmark_additional_args }} exec benchmark_exec true
+      {{ binary_path }} {{ additional_args }} exec benchmark_exec true
 
 - name: Include Unix/Linux tasks
-  include_tasks: unix.yml
+  include_tasks: "../../shared_tasks/unix_default_benchmark_body.yml"
   when: ansible_os_family != 'Windows'
 
 - name: Include Windows tasks
-  include_tasks: windows.yml
+  include_tasks: ../../shared_tasks/windows_default_benchmark_body.yml
   when: ansible_os_family == 'Windows'

projects/container_bench/toolbox/container_bench_exec_benchmark/tasks/unix.yml

@@ -1,19 +1,29 @@
 ---
-# Define common command templates (shared across all platforms)
-- name: Set common commands
+- name: Validate required variables are defined
+  assert:
+    that:
+      - container_bench_helloworld_benchmark_exec_time_path is defined
+      - container_bench_helloworld_benchmark_binary_path is defined
+      - container_bench_helloworld_benchmark_rootfull is defined
+      - container_bench_helloworld_benchmark_additional_args is defined
+  when: false  # This task never runs but validates variable definitions
+
+- include_tasks: "../../shared_tasks/map_variables.yml"
+  vars:
+    role_name: "container_bench_helloworld_benchmark"
+
+- name: Set common commands (shared across all platforms)
   set_fact:
-    prepare_commands: |
-      {{ container_bench_helloworld_benchmark_binary_path }} {{ container_bench_helloworld_benchmark_additional_args }} system prune -a -f
-      {{ container_bench_helloworld_benchmark_binary_path }} {{ container_bench_helloworld_benchmark_additional_args }} pull quay.io/podman/hello
-    cleanup_commands: |
-      {{ container_bench_helloworld_benchmark_binary_path }} {{ container_bench_helloworld_benchmark_additional_args }} system prune -a -f
+    image_to_pull: "quay.io/podman/hello"
+    prepare_commands: "" # Image is pulled using shared pull_image task below
+    cleanup_commands: "" # Cleanup handled by shared tasks
     benchmark_command: |
-      {{ container_bench_helloworld_benchmark_binary_path }} {{ container_bench_helloworld_benchmark_additional_args }} run --rm quay.io/podman/hello
+      {{ binary_path }} {{ additional_args }} run --rm quay.io/podman/hello
 
 - name: Include Unix/Linux tasks
-  include_tasks: unix.yml
+  include_tasks: "../../shared_tasks/unix_default_benchmark_body.yml"
   when: ansible_os_family != 'Windows'
 
 - name: Include Windows tasks
-  include_tasks: windows.yml
+  include_tasks: "../../shared_tasks/windows_default_benchmark_body.yml"
   when: ansible_os_family == 'Windows'