2 files changed, 40 insertions, 45 deletions
diff --git a/fdio.infra.ansible/roles/dpdk/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/dpdk/tasks/deploy_block.yaml
new file mode 100644
index 0000000000..1f972f5320
--- /dev/null
+++ b/fdio.infra.ansible/roles/dpdk/tasks/deploy_block.yaml
@@ -0,0 +1,33 @@
+---
+# file: tasks/deploy_block.yaml
+
+- name: Download Release {{ item }}
+  ansible.builtin.get_url:
+    url: "{{ dpdk_url }}/dpdk-{{ item }}.tar.xz"
+    dest: "{{ dpdk_target_dir }}/dpdk-{{ item }}.tar.xz"
+    mode: 0644
+  register: dpdk_downloaded
+
+- name: Extract Release {{ item }}
+  ansible.builtin.unarchive:
+    remote_src: true
+    src: "{{ dpdk_target_dir }}/dpdk-{{ item }}.tar.xz"
+    dest: "{{ dpdk_target_dir }}/"
+    creates: "{{ dpdk_target_dir }}/dpdk-{{ item }}"
+  when: dpdk_downloaded
+  register: dpdk_extracted
+
+- name: Compile Release I
+  ansible.builtin.command: "meson -Dexamples=l3fwd build"
+  args:
+    chdir: "{{ dpdk_target_dir }}/dpdk-{{ item }}"
+  environment:
+    CFLAGS: "-DRTE_LIBRTE_I40E_16BYTE_RX_DESC=y"
+  register: dpdk_compiled
+
+- name: Compile Release II
+  ansible.builtin.command: "ninja -C build"
+  args:
+    chdir: "{{ dpdk_target_dir }}/dpdk-{{ item }}"
+  environment:
+    CFLAGS: "-DRTE_LIBRTE_I40E_16BYTE_RX_DESC=y"
+\ No newline at end of file
diff --git a/fdio.infra.ansible/roles/dpdk/tasks/main.yaml b/fdio.infra.ansible/roles/dpdk/tasks/main.yaml
index 9052baff74..4f6c9ec9f2 100644
--- a/fdio.infra.ansible/roles/dpdk/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/dpdk/tasks/main.yaml
@@ -1,8 +1,8 @@
 ---
-# file: roles/dpdk/tasks/main.yaml
+# file: tasks/main.yaml
 
-- name: Inst - Update Package Cache (APT)
-  apt:
+- name: Update Package Cache (APT)
+  ansible.builtin.apt:
     update_cache: true
     cache_valid_time: 3600
   when:
@@ -10,53 +10,15 @@
   tags:
     - dpdk-inst-prerequisites
 
-- name: Inst - Prerequisites
-  package:
+- name: Prerequisites
+  ansible.builtin.package:
     name: "{{ packages | flatten(levels=1) }}"
     state: "latest"
   tags:
     - dpdk-inst-prerequisites
 
-- name: Inst - Download Release Archive
-  get_url:
-    url: "{{ dpdk_url }}/dpdk-{{ item }}.tar.xz"
-    dest: "{{ dpdk_target_dir }}/dpdk-{{ item }}.tar.xz"
-    mode: 0644
+- name: Multiple DPDK Versions
+  include_tasks: deploy_block.yaml
   loop: "{{ dpdk_version }}"
-  register: "dpdk_downloaded"
-  tags:
-    - dpdk-inst
-
-- name: Inst - Extract Release Archive
-  unarchive:
-    remote_src: true
-    src: "{{ dpdk_target_dir }}/dpdk-{{ item }}.tar.xz"
-    dest: "{{ dpdk_target_dir }}/"
-    creates: "{{ dpdk_target_dir }}/dpdk-{{ item }}"
-  loop: "{{ dpdk_version }}"
-  when: "dpdk_downloaded"
-  register: "dpdk_extracted"
-  tags:
-    - dpdk-inst
-
-- name: Inst - Compile Release I
-  command: "meson -Dexamples=l3fwd build"
-  args:
-    chdir: "{{ dpdk_target_dir }}/dpdk-{{ item }}"
-  environment:
-    CFLAGS: "-DRTE_LIBRTE_I40E_16BYTE_RX_DESC=y"
-  loop: "{{ dpdk_version }}"
-  register: "dpdk_compiled"
-  tags:
-    - dpdk-inst
-
-- name: Inst - Compile Release II
-  command: "ninja -C build"
-  args:
-    chdir: "{{ dpdk_target_dir }}/dpdk-{{ item }}"
-  environment:
-    CFLAGS: "-DRTE_LIBRTE_I40E_16BYTE_RX_DESC=y"
-  loop: "{{ dpdk_version }}"
-  register: "dpdk_compiled"
   tags:
     - dpdk-inst