diff options
| author |   pmikus <peter.mikus@protonmail.ch> | 2022-09-13 07:38:03 +0000 |
|---|---|---|
| committer | Peter Mikus <peter.mikus@protonmail.ch> | 2022-09-13 07:41:17 +0000 |
| commit | 086b0449501bc4eb51cd617f28dd50e04326878a (patch) | |
| tree | 95d48702072c871665713af83bb6cf6de2032249 /fdio.infra.ansible | |
| parent | c2d12bb8aefc1b5dc856d2278d7ea81321f74c8f (diff) | |
fix(ansible): Compatibility improvements
Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: I7f17cabb26c7684f0e6520e9f8ba755434a0e319
Diffstat (limited to 'fdio.infra.ansible')
6 files changed, 29 insertions, 4 deletions
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml index c11c421769..7f78d8c7b5 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml @@ -21,5 +21,5 @@ sysctl: inventory_ipmi_hostname: "10.30.50.36" cpu_microarchitecture: "taishan" -intel_700_matrix: "dpdk22.03" +intel_700_matrix: "dpdk22.07" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml index ab3176ef78..89e57024fe 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml @@ -21,5 +21,5 @@ sysctl: inventory_ipmi_hostname: "10.30.50.37" cpu_microarchitecture: "taishan" -intel_700_matrix: "dpdk22.03" +intel_700_matrix: "dpdk22.07" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml index 85184b5540..3b9b63dfd0 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml @@ -30,4 +30,4 @@ inventory_ipmi_hostname: "10.30.50.46" cpu_microarchitecture: "skylake" docker_tg: true -intel_700_matrix: "dpdk21.02" +intel_700_matrix: "dpdk22.07" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml index 07eb7be548..f88ec8cfbf 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml @@ -37,4 +37,4 @@ users: - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes" -intel_700_matrix: "dpdk22.03" +intel_700_matrix: "dpdk22.07" diff --git a/fdio.infra.ansible/roles/csit_sut_image/tasks/main.yaml b/fdio.infra.ansible/roles/csit_sut_image/tasks/main.yaml index 50b6b64abb..f0a93c06ee 100644 --- a/fdio.infra.ansible/roles/csit_sut_image/tasks/main.yaml +++ b/fdio.infra.ansible/roles/csit_sut_image/tasks/main.yaml @@ -26,5 +26,18 @@ ansible.builtin.shell: "docker build -t csit_sut-ubuntu2204:local ." args: chdir: "/opt/csit-sut" + async: 3000 + poll: 0 + register: docker_built tags: - csit-sut-image + +- name: Check if CSIT SUT Docker Image is Built + async_status: + jid: "{{ docker_built.ansible_job_id }}" + register: docker_built + until: docker_built.finished + delay: 10 + retries: 300 + tags: + - csit-sut-image
\ No newline at end of file diff --git a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml index d2fa2a3072..b436879a54 100644 --- a/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml +++ b/fdio.infra.ansible/roles/trex/tasks/deploy_block.yaml @@ -56,6 +56,18 @@ ansible.builtin.command: "./b build" args: chdir: "{{ trex_target_dir }}/trex-core-{{ item }}/linux_dpdk/" + 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: Switch to gcc-11 |