diff options
Diffstat (limited to 'resources')
4 files changed, 11 insertions, 8 deletions
diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 5ffc7c04e3..99c1e87d55 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -179,7 +179,7 @@ class Constants: QEMU_VM_IMAGE = u"/var/lib/vm/vhost-nested.img" # QEMU VM DPDK path - QEMU_VM_DPDK = u"/opt/dpdk-19.02" + QEMU_VM_DPDK = u"/opt/dpdk-stable-19.08.2" # Docker container SUT image DOCKER_SUT_IMAGE_UBUNTU = u"snergster/csit-sut:latest" diff --git a/resources/libraries/python/QemuUtils.py b/resources/libraries/python/QemuUtils.py index 2b08429d84..9fb24106c6 100644 --- a/resources/libraries/python/QemuUtils.py +++ b/resources/libraries/python/QemuUtils.py @@ -63,7 +63,7 @@ class QemuUtils: dpdk_target = u"arm64-armv8a" if self._arch == u"aarch64" \ else u"x86_64-native" self._testpmd_path = f"{Constants.QEMU_VM_DPDK}/" \ - f"{dpdk_target}-linuxapp-gcc/app" + f"{dpdk_target}-linux-gcc/app" self._vm_info = { u"host": node[u"host"], u"type": NodeType.VM, diff --git a/resources/tools/testbed-setup/ansible/roles/dpdk/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/dpdk/defaults/main.yaml index 27907f7d0e..d56b967b97 100644 --- a/resources/tools/testbed-setup/ansible/roles/dpdk/defaults/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/dpdk/defaults/main.yaml @@ -18,7 +18,7 @@ packages_by_arch: - [] dpdk_target_dir: "/opt" -dpdk_version: "dpdk-19.02" +dpdk_version: "19.08.2" dpdk_url: "https://fast.dpdk.org/rel" dpdk_build_targets: aarch64: "arm64-armv8a" diff --git a/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml index 3c4f69b5a0..9577c5c392 100644 --- a/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml +++ b/resources/tools/testbed-setup/ansible/roles/dpdk/tasks/main.yaml @@ -11,16 +11,19 @@ - name: DPDK - Download Release Archive get_url: - url: "{{ dpdk_url }}/{{ dpdk_version }}.tar.xz" - dest: "{{ dpdk_target_dir }}/{{ dpdk_version }}.tar.xz" + url: "{{ dpdk_url }}/dpdk-{{ dpdk_version }}.tar.xz" + dest: "{{ dpdk_target_dir }}/dpdk-{{ dpdk_version }}.tar.xz" mode: 0644 register: "linux__dpdk_downloaded" tags: - install-dpdk - name: Extract DPDK release archive - become: yes - shell: "cd {{ dpdk_target_dir }}; tar xf {{ dpdk_target_dir }}/{{ dpdk_version }}.tar.xz" + unarchive: + remote_src: true + src: "{{ dpdk_target_dir }}/dpdk-{{ dpdk_version }}.tar.xz" + dest: "{{ dpdk_target_dir }}/" + creates: "{{ dpdk_target_dir }}/dpdk-stable-{{ dpdk_version }}" when: "linux__dpdk_downloaded" register: "linux__dpdk_extracted" tags: @@ -28,7 +31,7 @@ - name: Compile DPDK release become: yes - command: "make install T={{ dpdk_build_targets[ansible_machine] }}-linuxapp-gcc DESTDIR={{ dpdk_target_dir }}/{{ dpdk_version }} chdir={{ dpdk_target_dir }}/{{ dpdk_version }}" + command: "make install T={{ dpdk_build_targets[ansible_machine] }}-linux-gcc DESTDIR={{ dpdk_target_dir }}/dpdk-stable-{{ dpdk_version }} chdir={{ dpdk_target_dir }}/dpdk-stable-{{ dpdk_version }}" when: "linux__dpdk_extracted" tags: - install-dpdk |