diff options
author | Tibor Frank <tifrank@cisco.com> | 2020-07-13 14:08:13 +0200 |
---|---|---|
committer | Dave Wallace <dwallacelf@gmail.com> | 2020-07-16 16:09:50 +0000 |
commit | 80adeefab9fc1871675688881498304ddc780828 (patch) | |
tree | 433d212f841e6cf5d25eb7226efacd5b6f2a9f46 /resources/tools/testbed-setup/ansible | |
parent | f9b18c597f8bd9419ce3ecdd36de351f7b05c59a (diff) |
Remove remains of WRK tests
Change-Id: If61783fb717757c6189f06924412bd079e15a08f
Signed-off-by: Tibor Frank <tifrank@cisco.com>
Diffstat (limited to 'resources/tools/testbed-setup/ansible')
7 files changed, 0 insertions, 84 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/tg.yaml b/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/tg.yaml index a026ec2acd..9ac83bc9fc 100644 --- a/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/tg.yaml +++ b/resources/tools/testbed-setup/ansible/roles/cleanup/tasks/tg.yaml @@ -7,10 +7,3 @@ process: "_t-rex" when: docker_tg is undefined tags: kill-process - -- name: Kill processes - WRK - import_tasks: kill_process.yaml - vars: - process: "wrk" - tags: kill-process - when: docker_tg is undefined
\ No newline at end of file diff --git a/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.sh b/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.sh index e9f19fd899..7b90d20bda 100755 --- a/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.sh +++ b/resources/tools/testbed-setup/ansible/roles/tg/files/csit-initialize-docker-tg.sh @@ -44,8 +44,6 @@ case "${1:-start}" in dcr_stc_params+="--volume /dev:/dev " # Mount /opt/boot/ where VM kernel and initrd are located. dcr_stc_params+="--volume /opt:/opt " - # Mount /usr/local/bin/wrk where WRK is located. - dcr_stc_params+="--volume /usr/local/bin/wrk:/usr/local/bin/wrk " # Mount host hugepages for VMs. dcr_stc_params+="--volume /dev/hugepages:/dev/hugepages " diff --git a/resources/tools/testbed-setup/ansible/roles/wrk/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/wrk/defaults/main.yaml deleted file mode 100644 index 2d378487df..0000000000 --- a/resources/tools/testbed-setup/ansible/roles/wrk/defaults/main.yaml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# file: roles/wrk/defaults/main.yaml - -packages: "{{ packages_base + packages_by_distro[ansible_distribution | lower] + packages_by_arch[ansible_machine] }}" - -packages_base: - - [] - -packages_by_distro: - ubuntu: - - "build-essential" - -packages_by_arch: - aarch64: - - [] - x86_64: - - [] - -wrk_target_dir: "/opt" -wrk_version: - - "4.0.2" diff --git a/resources/tools/testbed-setup/ansible/roles/wrk/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/wrk/tasks/main.yaml deleted file mode 100644 index 163044de43..0000000000 --- a/resources/tools/testbed-setup/ansible/roles/wrk/tasks/main.yaml +++ /dev/null @@ -1,48 +0,0 @@ ---- -# file: roles/wrk/tasks/main.yaml - -- name: WRK - Install Distribution - Release - Machine Prerequisites - package: - name: "{{ packages | flatten(levels=1) }}" - state: latest - update_cache: true - tags: - - install-dependencies - -- name: WRK - Get Release Archive - get_url: - url: "https://github.com/wg/wrk/archive/{{ item }}.tar.gz" - dest: "{{ wrk_target_dir }}/wrk-{{ item }}.tar.gz" - mode: 0644 - loop: "{{ wrk_version }}" - register: wrk_downloaded - tags: - - install-wrk - -- name: WRK - Extract Release Archive - unarchive: - remote_src: true - src: "{{ wrk_target_dir }}/wrk-{{ item }}.tar.gz" - dest: "{{ wrk_target_dir }}/" - creates: "{{ wrk_target_dir }}/wrk-{{ item }}/src" - loop: "{{ wrk_version }}" - register: wrk_extracted - tags: - - install-wrk - -- name: WRK - Compile Release I - command: "make" - args: - chdir: "{{ wrk_target_dir }}/wrk-{{ item }}" - loop: "{{ wrk_version }}" - when: wrk_extracted - register: wrk_compiled - tags: - - install-wrk - -- name: WRK - Copy Binary - command: "cp {{ wrk_target_dir }}/wrk-{{ item }}/wrk /usr/local/bin/" - loop: "{{ wrk_version }}" - when: wrk_compiled - tags: - - install-wrk diff --git a/resources/tools/testbed-setup/ansible/tg.yaml b/resources/tools/testbed-setup/ansible/tg.yaml index e800881127..e6c5b4b9db 100644 --- a/resources/tools/testbed-setup/ansible/tg.yaml +++ b/resources/tools/testbed-setup/ansible/tg.yaml @@ -20,8 +20,6 @@ tags: iperf - role: trex tags: trex - - role: wrk - tags: wrk - role: docker tags: docker - role: performance_tuning diff --git a/resources/tools/testbed-setup/ansible/tg_aws.yaml b/resources/tools/testbed-setup/ansible/tg_aws.yaml index dda50f416e..77fde766c9 100644 --- a/resources/tools/testbed-setup/ansible/tg_aws.yaml +++ b/resources/tools/testbed-setup/ansible/tg_aws.yaml @@ -19,8 +19,6 @@ tags: iperf - role: trex tags: trex - - role: wrk - tags: wrk - role: docker tags: docker - role: cleanup diff --git a/resources/tools/testbed-setup/ansible/tg_azure.yaml b/resources/tools/testbed-setup/ansible/tg_azure.yaml index afe2d11c4a..7ecf6d074c 100644 --- a/resources/tools/testbed-setup/ansible/tg_azure.yaml +++ b/resources/tools/testbed-setup/ansible/tg_azure.yaml @@ -17,8 +17,6 @@ tags: iperf - role: trex tags: trex - - role: wrk - tags: wrk - role: docker tags: docker - role: cleanup |