feat(core): Adjust T-Rex for external topologies

[csit.git] / fdio.infra.ansible / roles / trex / tasks / deploy_block.yaml

diff --git a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml
index 946206a..9593305 100644 (file)
--- a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml
+++ b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml
@@ -1,5 +1,5 @@
 ---
-# file: roles/trex/tasks/deploy_block.yaml
+# file: tasks/deploy_block.yaml
 
 - name: Get Release {{ item }}
   ansible.builtin.get_url:
@@ -22,22 +22,6 @@
     creates: "{{ trex_target_dir }}/trex-core-{{ item }}/linux_dpdk/"
   register: trex_extracted
 
-- name: Patch Azure
-  ansible.builtin.patch:
-    src: "files/t-rex.patch"
-    basedir: "{{ trex_target_dir }}/trex-core-{{ item }}"
-    strip: 1
-  when:
-    - azure is defined and item == "2.73"
-
-- name: Switch to gcc-9
-  ansible.builtin.command: "update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 9"
-  when: trex_extracted.changed
-
-- name: Switch to g++-9
-  ansible.builtin.command: "update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 9"
-  when: trex_extracted.changed
-
 - name: Compile Release {{ item }} Part I
   ansible.builtin.command: "./b configure"
   args:
@@ -48,24 +32,32 @@
   ansible.builtin.command: "./b build"
   args:
     chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/linux_dpdk/"
-  when: trex_extracted.changed
-
-- name: Switch to gcc-11
-  ansible.builtin.command: "update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 11"
-  when: trex_extracted.changed
-
-- name: Switch to g++-11
-  ansible.builtin.command: "update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 11"
-  when: trex_extracted.changed
-
-- name: Compile Release {{ item }} Part III
-  ansible.builtin.command: "make -j 16"
-  args:
-    chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src"
-  when: trex_extracted.changed
-
-- name: Compile Release {{ item }} Part IV
-  ansible.builtin.command: "make install"
-  args:
-    chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src"
+  async: 3000
+  poll: 0
+  register: trex_built
+  when: trex_extracted.changed
+
+- name: Check if T-Rex is Compiled
+  async_status:
+    jid: "{{ trex_built.ansible_job_id }}"
+  register: trex_built
+  until: trex_built.finished
+  delay: 10
+  retries: 300
+  when: trex_extracted.changed
+
+#- name: Compile Release {{ item }} Part III
+#  ansible.builtin.command: "make -j 16"
+#  args:
+#    chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src"
+#  when: trex_extracted.changed
+
+#- name: Compile Release {{ item }} Part IV
+#  ansible.builtin.command: "make install"
+#  args:
+#    chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/scripts/ko/src"
+#  when: trex_extracted.changed
+
+- name: Link libc.a to liblibc.a
+  ansible.builtin.command: "ln -s -f /usr/lib/x86_64-linux-gnu/libc.a /usr/lib/x86_64-linux-gnu/liblibc.a"
   when: trex_extracted.changed