diff options
Diffstat (limited to 'fdio.infra.ansible')
37 files changed, 139 insertions, 327 deletions
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 81794519b3..8ac5bd019d 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 @@ -35,11 +35,5 @@ docker_tg: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml index 1a269d627d..2ac00bc6cf 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.40.yaml @@ -35,18 +35,12 @@ intel_qat_matrix: true docker_sut: true docker_volumes: - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/dev/null" target: "/etc/sysctl.d/80-vpp.conf" - source: "/opt/boot/" target: "/opt/boot/" - - source: "/opt/dpdk-24.07/" - target: "/opt/dpdk-24.07/" + - source: "/opt/dpdk-24.11.1/" + target: "/opt/dpdk-24.11.1/" - source: "/usr/bin/iperf3" target: "/usr/bin/iperf3" - source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.41.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.41.yaml index 3dc853ad5d..9b8d4e6f5f 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.41.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.41.yaml @@ -36,11 +36,5 @@ intel_qat_matrix: true docker_tg: true docker_volumes: - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml index 7d7fb29b05..107ddd8751 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.42.yaml @@ -35,18 +35,12 @@ intel_qat_matrix: true docker_sut: true docker_volumes: - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/dev/null" target: "/etc/sysctl.d/80-vpp.conf" - source: "/opt/boot/" target: "/opt/boot/" - - source: "/opt/dpdk-24.07/" - target: "/opt/dpdk-24.07/" + - source: "/opt/dpdk-24.11.1/" + target: "/opt/dpdk-24.11.1/" - source: "/usr/bin/iperf3" target: "/usr/bin/iperf3" - source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.43.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.43.yaml index 4cb3dd7c70..b29ccc6207 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.43.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.43.yaml @@ -35,11 +35,5 @@ intel_qat_matrix: true docker_tg: true docker_volumes: - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml index 55709c10ab..066e66edb8 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml @@ -37,18 +37,12 @@ docker_sut: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/dev/null" target: "/etc/sysctl.d/80-vpp.conf" - source: "/opt/boot/" target: "/opt/boot/" - - source: "/opt/dpdk-24.07/" - target: "/opt/dpdk-24.07/" + - source: "/opt/dpdk-24.11.1/" + target: "/opt/dpdk-24.11.1/" - source: "/usr/bin/iperf3" target: "/usr/bin/iperf3" - source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml index 3c149ad194..10a7369ffc 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml @@ -37,11 +37,5 @@ docker_tg: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml index 1567d7e7ef..17aa30b70d 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml @@ -35,16 +35,12 @@ intel_qat_matrix: true docker_sut: true docker_volumes: - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/dev/null" target: "/etc/sysctl.d/80-vpp.conf" - source: "/opt/boot/" target: "/opt/boot/" + - source: "/opt/dpdk-24.11.1/" + target: "/opt/dpdk-24.11.1/" - source: "/usr/bin/iperf3" target: "/usr/bin/iperf3" - source: "/usr/lib/x86_64-linux-gnu/libiperf.so.0" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml index 133ea10ba5..9f824b51e8 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml @@ -35,11 +35,5 @@ intel_qat_matrix: true docker_tg: true docker_volumes: - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml index 5a8fe6e5fa..45837a6dbd 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml @@ -38,11 +38,5 @@ docker_tg: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml index 062b90af88..bf2b17abb1 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml @@ -38,11 +38,5 @@ docker_tg: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml index 7b89421b1e..344108c41a 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.61.yaml @@ -33,11 +33,5 @@ docker_tg: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml index f1da8fedcd..e6b2f48b72 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml @@ -34,11 +34,5 @@ intel_800_matrix: "dpdk24.07" docker_tg: true docker_volumes: - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.77.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.77.yaml index fa86f2f54b..c06ae26221 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.77.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.77.yaml @@ -37,11 +37,5 @@ docker_tg: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml index 82891bab43..e0c84f4e6d 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.80.yaml @@ -37,11 +37,5 @@ docker_tg: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml index b8a42b5b10..9f9eb9b89b 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.82.yaml @@ -37,11 +37,5 @@ docker_tg: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml index 099287b1cd..c743c08efc 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.84.yaml @@ -37,11 +37,5 @@ docker_tg: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml index 5baea522eb..ee03a4b33b 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.86.yaml @@ -37,11 +37,5 @@ docker_tg: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml index e3cb0e8715..300515cd1d 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.88.yaml @@ -37,11 +37,5 @@ docker_tg: true docker_volumes: - source: "/usr/bin/ofed_info" target: "/usr/bin/ofed_info" - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml index fe11858803..0a356dfca8 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.89.yaml @@ -34,11 +34,5 @@ intel_800_matrix: "dpdk24.07" docker_tg: true docker_volumes: - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.90.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.90.yaml index 6b1291633c..3bd4664ac0 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.90.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.90.yaml @@ -33,11 +33,5 @@ intel_800_matrix: "dpdk24.07" docker_tg: true docker_volumes: - - source: "/dev/hugepages" - target: "/dev/hugepages" - - source: "/dev/vfio" - target: "/dev/vfio" - - source: "/etc/sudoers" - target: "/etc/sudoers" - source: "/usr/lib/firmware/" target: "/usr/lib/firmware/"
\ No newline at end of file diff --git a/fdio.infra.ansible/roles/aws/tasks/main.yaml b/fdio.infra.ansible/roles/aws/tasks/main.yaml index 750bf9f4f7..d6304f8bc7 100644 --- a/fdio.infra.ansible/roles/aws/tasks/main.yaml +++ b/fdio.infra.ansible/roles/aws/tasks/main.yaml @@ -79,6 +79,14 @@ tags: - conf-ssh +- name: "Enable Password Less sudo" + ansible.builtin.lineinfile: + dest: "/etc/ssh/sshd_config" + regexp: "^#PermitRootLogin prohibit-password" + line: "PermitRootLogin yes" + tags: + - conf-ssh + - name: "Recursively Delete Other Configs" ansible.builtin.file: path: "/etc/ssh/sshd_config.d" @@ -141,8 +149,9 @@ - name: "Add User" ansible.builtin.user: - createhome: "yes" - groups: "adm,sudo" + append: true + createhome: true + groups: "admin,adm,sudo" name: "testuser" password: "$6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0" shell: "/bin/bash" @@ -169,3 +178,12 @@ validate: "/usr/sbin/visudo -cf %s" tags: - aws-sudoers + +- name: "sudoers nopasswd" + ansible.builtin.lineinfile: + path: "/etc/sudoers" + state: "present" + line: "%testuser ALL=(ALL) NOPASSWD: ALL" + validate: "/usr/sbin/visudo -cf %s" + tags: + - aws-sudoers
\ No newline at end of file diff --git a/fdio.infra.ansible/roles/cleanup/files/reset_vppdevice.sh b/fdio.infra.ansible/roles/cleanup/files/reset_vppdevice.sh deleted file mode 100644 index ede2db1273..0000000000 --- a/fdio.infra.ansible/roles/cleanup/files/reset_vppdevice.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -function die () { - # Print the message to standard error end exit with error code specified - # by the second argument. - # - # Hardcoded values: - # - The default error message. - # Arguments: - # - ${1} - The whole error message, be sure to quote. Optional - # - ${2} - the code to exit with, default: 1. - - set +eu - warn "${1:-Unspecified run-time error occurred!}" - exit "${2:-1}" -} - - -function set_eligibility_off { - # Set Nomad eligibility to ineligible for scheduling. Fail otherwise. - - set -euo pipefail - - node_id="$(nomad node status | grep $(hostname) | cut -d ' ' -f 1)" || die - node_status="$(nomad node status | grep $(hostname))" || die - - if [[ "${node_status}" != *"ineligible"* ]]; then - nomad node eligibility -disable "${node_id}" || die - node_status="$(nomad node status | grep $(hostname))" || die - if [[ "${node_status}" != *"ineligible"* ]]; then - die "Set eligibility off failed!" - fi - fi -} - - -function set_eligibility_on { - # Set Nomad eligibility to eligible for scheduling. Fail otherwise. - - set -euo pipefail - - node_id="$(nomad node status | grep $(hostname) | cut -d ' ' -f 1)" || die - node_status="$(nomad node status | grep $(hostname))" || die - - if [[ "${node_status}" == *"ineligible"* ]]; then - nomad node eligibility -enable "${node_id}" || die - node_status="$(nomad node status | grep $(hostname))" || die - if [[ "${node_status}" == *"ineligible"* ]]; then - die "Set eligibility on failed!" - fi - fi -} - - -function restart_vfs_service { - # Stop and start VF serice. This will reinitialize VFs and driver mappings. - - set -euo pipefail - - warn "Restarting VFs service (this may take few minutes)..." - sudo service csit-initialize-vfs stop || die "Failed to stop VFs service!" - sudo service csit-initialize-vfs start || die "Failed to start VFs service!" -} - - -function wait_for_pending_containers { - # Wait in loop for defined amount of time for pending containers to - # gracefully quit them. If parameter force is specified. Force kill them. - - # Arguments: - # - ${@} - Script parameters. - - set -euo pipefail - - retries=60 - wait_time=60 - containers=(docker ps --quiet --filter name=csit*) - - for i in $(seq 1 ${retries}); do - mapfile -t pending_containers < <( ${containers[@]} ) || die - warn "Waiting for pending containers [${pending_containers[@]}] ..." - if [ ${#pending_containers[@]} -eq 0 ]; then - break - fi - sleep "${wait_time}" || die - done - if [ ${#pending_containers[@]} -ne 0 ]; then - if [[ "${1-}" == "force" ]]; then - warn "Force killing [${pending_containers[@]}] ..." - docker rm --force ${pending_containers[@]} || die - else - die "Still few containers running!" - fi - fi -} - - -function warn () { - # Print the message to standard error. - # - # Arguments: - # - ${@} - The text of the message. - - echo "$@" >&2 -} - - -set_eligibility_off || die -wait_for_pending_containers "${@}" || die -restart_vfs_service || die -set_eligibility_on || die diff --git a/fdio.infra.ansible/roles/cleanup/tasks/clean_images.yaml b/fdio.infra.ansible/roles/cleanup/tasks/clean_images.yaml index 76704ab50d..269b0e523d 100644 --- a/fdio.infra.ansible/roles/cleanup/tasks/clean_images.yaml +++ b/fdio.infra.ansible/roles/cleanup/tasks/clean_images.yaml @@ -1,9 +1,9 @@ --- # file: tasks/clean_images.yaml -- name: Clean Docker Images +- name: "Clean Docker Images" block: - - name: Clean Images - Prefetch Docker Images + - name: "Clean Images - Prefetch Docker Images" ansible.builtin.cron: name: "Prefetch docker image {{ item }}" minute: "10" @@ -14,7 +14,7 @@ tags: - prefetch-docker-images - - name: Clean Images - Remove Dangling Docker Images + - name: "Clean Images - Remove Dangling Docker Images" ansible.builtin.cron: name: "Remove dangling docker images" minute: "10" @@ -22,15 +22,4 @@ weekday: "7" job: "/usr/bin/docker rmi $(/usr/bin/docker images --filter 'dangling=true' -q)" tags: - - remove-docker-images-dangling - -# TODO: Disabled until all images will be in registry -# - name: Clean Images - Prune Docker Images -# cron: -# name: "Prune docker images" -# minute: "10" -# hour: "6" -# weekday: 7 -# job: "/usr/bin/docker image prune --all --force" -# tags: -# - prune-docker-images + - remove-docker-images-dangling
\ No newline at end of file diff --git a/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml b/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml index dc739eb954..9c3dc173bc 100644 --- a/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml +++ b/fdio.infra.ansible/roles/cleanup/tasks/kill_containers.yaml @@ -1,37 +1,37 @@ --- # file: tasks/kill_containers.yaml -- name: Kill Docker Containers +- name: "Kill Docker Containers" block: - - name: Get Running Docker Containers + - name: "Get Running Docker Containers" ansible.builtin.shell: "docker ps -a --filter name=DUT -q" register: running_containers changed_when: false tags: - kill-containers - - name: Remove All Docker Containers + - name: "Remove All Docker Containers" ansible.builtin.shell: "docker rm --force {{ item }}" with_items: "{{ running_containers.stdout_lines }}" tags: - kill-containers rescue: - - name: Restart Docker Daemon + - name: "Restart Docker Daemon" ansible.builtin.systemd: name: "docker" state: "restarted" -- name: Kill LXC Containers +- name: "Kill LXC Containers" block: - - name: Get Running LXC Containers + - name: "Get Running LXC Containers" ansible.builtin.shell: "lxc-ls" register: running_containers changed_when: false tags: - kill-containers - - name: Remove All LXC Containers + - name: "Remove All LXC Containers" ansible.builtin.shell: "lxc-destroy --force -n {{ item }}" with_items: "{{ running_containers.stdout_lines }}" tags: diff --git a/fdio.infra.ansible/roles/cleanup/tasks/kill_process.yaml b/fdio.infra.ansible/roles/cleanup/tasks/kill_process.yaml index 9ab98a8e57..94f6d0439e 100644 --- a/fdio.infra.ansible/roles/cleanup/tasks/kill_process.yaml +++ b/fdio.infra.ansible/roles/cleanup/tasks/kill_process.yaml @@ -1,9 +1,9 @@ --- # file: tasks/kill_process.yaml -- name: Kill Process - {{ process }} +- name: "Kill Process - {{ process }}" block: - - name: Get PID Of {{ process }} + - name: "Get PID Of {{ process }}" ansible.builtin.shell: "ps -ef | grep -v grep | grep -w {{ process }} | awk '{print $2}'" when: - process is defined and process != "" @@ -11,7 +11,7 @@ tags: - kill-process - - name: Safe Kill {{ process }} + - name: "Safe Kill {{ process }}" ansible.builtin.shell: "kill {{ item }}" with_items: "{{ running_processes.stdout_lines }}" ignore_errors: true @@ -27,7 +27,7 @@ tags: - kill-process - - name: Kill Process - Force Kill {{ process }} + - name: "Kill Process - Force Kill {{ process }}" ansible.builtin.shell: "kill -9 {{ item }}" with_items: "{{ killed_processes.results | select('failed') | map(attribute='item') | list }}" tags: diff --git a/fdio.infra.ansible/roles/cleanup/tasks/main.yaml b/fdio.infra.ansible/roles/cleanup/tasks/main.yaml index c97b9c5d7e..82e5a372bb 100644 --- a/fdio.infra.ansible/roles/cleanup/tasks/main.yaml +++ b/fdio.infra.ansible/roles/cleanup/tasks/main.yaml @@ -1,26 +1,20 @@ --- # file: tasks/main.yaml -- name: tg specific - include_tasks: tg.yaml +- name: "tg specific" + include_tasks: "tg.yaml" when: "'tg' in group_names" tags: - cleanup -- name: sut specific +- name: "sut specific" include_tasks: sut.yaml when: "'sut' in group_names" tags: - cleanup -- name: vpp_device specific - include_tasks: vpp_device.yaml - when: "'vpp_device' in group_names" - tags: - - cleanup - -- name: nomad specific - include_tasks: nomad.yaml +- name: "nomad specific" + include_tasks: "nomad.yaml" when: "'nomad' in group_names" tags: - cleanup diff --git a/fdio.infra.ansible/roles/cleanup/tasks/nomad.yaml b/fdio.infra.ansible/roles/cleanup/tasks/nomad.yaml index 086a4eff7d..babf6be34a 100644 --- a/fdio.infra.ansible/roles/cleanup/tasks/nomad.yaml +++ b/fdio.infra.ansible/roles/cleanup/tasks/nomad.yaml @@ -1,10 +1,10 @@ --- # file: tasks/nomad.yaml -- name: Host Cleanup +- name: "Host Cleanup" block: - - name: Clean Images - import_tasks: clean_images.yaml + - name: "Clean Images" + import_tasks: "clean_images.yaml" vars: images_to_prefetch_by_arch: aarch64: diff --git a/fdio.infra.ansible/roles/cleanup/tasks/remove_package.yaml b/fdio.infra.ansible/roles/cleanup/tasks/remove_package.yaml index 652729bc30..a40b1d36c8 100644 --- a/fdio.infra.ansible/roles/cleanup/tasks/remove_package.yaml +++ b/fdio.infra.ansible/roles/cleanup/tasks/remove_package.yaml @@ -1,14 +1,14 @@ --- # file: tasks/remove_package.yaml -- name: Fix Corrupted APT +- name: "Fix Corrupted APT" ansible.builtin.shell: "dpkg --configure -a" when: - ansible_distribution == 'Ubuntu' tags: - remove-package -- name: Remove Package - {{ package }} +- name: "Remove Package - {{ package }}" ansible.builtin.apt: name: "{{ package }}" force: true diff --git a/fdio.infra.ansible/roles/cleanup/tasks/sut.yaml b/fdio.infra.ansible/roles/cleanup/tasks/sut.yaml index 22bf596369..fa0d89816f 100644 --- a/fdio.infra.ansible/roles/cleanup/tasks/sut.yaml +++ b/fdio.infra.ansible/roles/cleanup/tasks/sut.yaml @@ -89,9 +89,47 @@ tags: - kill-containers + - name: "Set SSH port to 6001 if docker_sut" + set_fact: + ansible_port: 6001 + when: docker_sut is defined + tags: + - remove-package + + - name: Remove Packages - Remove VPP + import_tasks: remove_package.yaml + when: docker_sut is defined + vars: + package: "*vpp*" + tags: + - remove-package + + - name: "Set SSH port to 6002 if docker_sut" + set_fact: + ansible_port: 6002 + when: docker_sut is defined + tags: + - remove-package + - name: Remove Packages - Remove VPP import_tasks: remove_package.yaml + when: docker_sut is defined vars: package: "*vpp*" tags: - remove-package + + - name: "Set SSH port to 22 if docker_sut" + set_fact: + ansible_port: 22 + when: docker_sut is defined + tags: + - remove-package + + - name: Remove Packages - Remove VPP + import_tasks: remove_package.yaml + when: docker_sut is undefined + vars: + package: "*vpp*" + tags: + - remove-package
\ No newline at end of file diff --git a/fdio.infra.ansible/roles/cleanup/tasks/tg.yaml b/fdio.infra.ansible/roles/cleanup/tasks/tg.yaml index 8c0162df2c..423fd43b1d 100644 --- a/fdio.infra.ansible/roles/cleanup/tasks/tg.yaml +++ b/fdio.infra.ansible/roles/cleanup/tasks/tg.yaml @@ -1,10 +1,10 @@ --- # file: tasks/tg.yaml -- name: Host Cleanup +- name: "Host Cleanup" block: - - name: Kill Processes - TRex - import_tasks: kill_process.yaml + - name: "Kill Processes - TRex" + import_tasks: "kill_process.yaml" vars: process: "_t-rex" when: diff --git a/fdio.infra.ansible/roles/cleanup/tasks/vpp_device.yaml b/fdio.infra.ansible/roles/cleanup/tasks/vpp_device.yaml deleted file mode 100644 index c97fa0cde5..0000000000 --- a/fdio.infra.ansible/roles/cleanup/tasks/vpp_device.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# file: tasks/vpp_device.yaml - -- name: Host Cleanup - block: - - name: Reset vpp_device Binary - ansible.builtin.copy: - src: "files/reset_vppdevice.sh" - dest: "/usr/local/bin" - owner: "root" - group: "root" - mode: "744" - tags: - - reset-sriov - - - name: Clean Images - import_tasks: clean_images.yaml - vars: - images_to_prefetch_by_arch: - aarch64: - - "fdiotools/builder-ubuntu2004:prod-aarch64" - - "fdiotools/builder-ubuntu1804:prod-aarch64" - - "fdiotools/builder-centos8:prod-aarch64" - x86_64: - - "fdiotools/builder-ubuntu2004:prod-x86_64" - - "fdiotools/builder-ubuntu1804:prod-x86_64" - - "fdiotools/builder-debian10:prod-x86_64" - - "fdiotools/builder-debian9:prod-x86_64" - - "fdiotools/builder-centos8:prod-x86_64" - - "fdiotools/builder-centos7:prod-x86_64" - tags: - - clean-images diff --git a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile index f30caeb344..b860f1e6e2 100644 --- a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile +++ b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile @@ -43,6 +43,7 @@ RUN apt-get -q update \ libnuma1 \ libnuma-dev \ libpcap-dev \ + libpcre2-dev \ libpixman-1-dev \ libsctp-dev \ libssl-dev \ diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 index 810374527c..10532fcfde 100644 --- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 +++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 @@ -16,6 +16,15 @@ services: restart: "always" shm_size: "4G" volumes: + - type: "bind" + source: "/dev/hugepages" + target: "/dev/hugepages" + - type: "bind" + source: "/dev/vfio" + target: "/dev/vfio" + - type: "bind" + source: "/etc/sudoers" + target: "/etc/sudoers" {% for volume in docker_volumes %} - type: "bind" source: "{{ volume.source }}" @@ -38,6 +47,15 @@ services: restart: "always" shm_size: "4G" volumes: + - type: "bind" + source: "/dev/hugepages" + target: "/dev/hugepages" + - type: "bind" + source: "/dev/vfio" + target: "/dev/vfio" + - type: "bind" + source: "/etc/sudoers" + target: "/etc/sudoers" {% for volume in docker_volumes %} - type: "bind" source: "{{ volume.source }}" diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2 index c4d53c90c2..9b03c65409 100644 --- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2 +++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-tg.yaml.j2 @@ -17,8 +17,17 @@ services: privileged: true restart: "always" shm_size: "4G" -{% if docker_volumes is defined and docker_volumes|length > 0 %} volumes: + - type: "bind" + source: "/dev/hugepages" + target: "/dev/hugepages" + - type: "bind" + source: "/dev/vfio" + target: "/dev/vfio" + - type: "bind" + source: "/etc/sudoers" + target: "/etc/sudoers" +{% if docker_volumes is defined and docker_volumes|length > 0 %} {% for volume in docker_volumes %} - type: "bind" source: "{{ volume.source }}" @@ -43,8 +52,17 @@ services: privileged: true restart: "always" shm_size: "4G" -{% if docker_volumes is defined and docker_volumes|length > 0 %} volumes: + - type: "bind" + source: "/dev/hugepages" + target: "/dev/hugepages" + - type: "bind" + source: "/dev/vfio" + target: "/dev/vfio" + - type: "bind" + source: "/etc/sudoers" + target: "/etc/sudoers" +{% if docker_volumes is defined and docker_volumes|length > 0 %} {% for volume in docker_volumes %} - type: "bind" source: "{{ volume.source }}" diff --git a/fdio.infra.ansible/roles/dpdk/defaults/main.yaml b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml index 22e960e98c..a5355eab4e 100644 --- a/fdio.infra.ansible/roles/dpdk/defaults/main.yaml +++ b/fdio.infra.ansible/roles/dpdk/defaults/main.yaml @@ -19,5 +19,5 @@ packages_by_arch: dpdk_target_dir: "/opt" dpdk_version: - - "24.07" + - "24.11.1" dpdk_url: "https://fast.dpdk.org/rel" diff --git a/fdio.infra.ansible/roles/dpdk/tasks/deploy_block.yaml b/fdio.infra.ansible/roles/dpdk/tasks/deploy_block.yaml index d5afe2d3f8..0d67c9732c 100644 --- a/fdio.infra.ansible/roles/dpdk/tasks/deploy_block.yaml +++ b/fdio.infra.ansible/roles/dpdk/tasks/deploy_block.yaml @@ -17,6 +17,11 @@ when: dpdk_downloaded register: dpdk_extracted +- name: "Rename folder" + ansible.builtin.command: "mv {{ dpdk_target_dir }}/dpdk-stable-{{ item }} {{ dpdk_target_dir }}/dpdk-{{ item }}" + ignore_errors: true + when: dpdk_extracted + - name: "Compile Release I" ansible.builtin.command: "meson -Dexamples=l3fwd build" args: |