diff options
Diffstat (limited to 'fdio.infra.ansible')
7 files changed, 21 insertions, 9 deletions
diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml index 2337277144..3dbdeaaf15 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml @@ -11,6 +11,7 @@ vfs_data_file: "csit-initialize-vfs-alt.sh" cpu_microarchitecture: "altra" intel_700_matrix: "dpdk22.07" +mellanox_matrix: "dpdk23.11" # User management. users: @@ -29,7 +30,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -64,6 +65,7 @@ nomad_servers: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -87,7 +89,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml index 1d414b32c7..baee725a4f 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml @@ -10,7 +10,8 @@ inventory_ipmi_hostname: "10.30.50.71" vfs_data_file: "csit-initialize-vfs-alt.sh" cpu_microarchitecture: "altra" -intel_700_matrix: "dpdk22.07" +intel_700_matrix: "dpdk22.03" +mellanox_matrix: "dpdk23.11" # User management. users: @@ -29,7 +30,7 @@ users: sshd_disable_password_login: true # Nomad settings. -nomad_version: "1.6.1" +nomad_version: "1.8.2" nomad_certificates: - src: "{{ file_nomad_ca_pem }}" dest: "{{ nomad_tls_ca_file }}" @@ -64,6 +65,7 @@ nomad_servers: # Consul settigs. nomad_use_consul: true +consul_version: "1.19.1" consul_certificates: - src: "{{ file_consul_ca_pem }}" dest: "{{ consul_ca_file }}" @@ -87,7 +89,7 @@ consul_retry_servers: consul_service_mgr: "systemd" # Vault settings. -vault_version: "1.13.1" +vault_version: "1.17.2" # Docker settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/hosts b/fdio.infra.ansible/inventories/lf_inventory/hosts index 420adc3a8d..604122c5c9 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/hosts +++ b/fdio.infra.ansible/inventories/lf_inventory/hosts @@ -53,8 +53,8 @@ all: hosts: 10.30.51.30: #s30-t15-sut1 - sapphirerapids 10.30.51.31: #s31-t16-sut1 - sapphirerapids - 10.30.51.70: #s55-t13-sut1 - thunderx2 9980 - 10.30.51.71: #s56-t14-sut1 - thunderx2 9980 + 10.30.51.70: #s70-t13-sut1 - thunderx2 9980 + 10.30.51.71: #s71-t14-sut1 - thunderx2 9980 nomad: hosts: 10.30.51.21: #s21-nomad - sapphirerapids diff --git a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile index 88af96bfa8..4514ec3679 100644 --- a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile +++ b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile @@ -137,4 +137,4 @@ RUN echo 'root:Csit1234' | chpasswd \ && sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config \ && echo "export VISIBLE=now" >> /etc/profile -RUN service ssh start
\ No newline at end of file +RUN service ssh start diff --git a/fdio.infra.ansible/roles/intel/defaults/main.yaml b/fdio.infra.ansible/roles/intel/defaults/main.yaml index 603b1367b9..dbc31e87c4 100644 --- a/fdio.infra.ansible/roles/intel/defaults/main.yaml +++ b/fdio.infra.ansible/roles/intel/defaults/main.yaml @@ -48,6 +48,11 @@ intel_download_url: "https://downloadmirror.intel.com" intel_extract_dir: "/opt" intel_700_compatibility_matrix: + dpdk22.03: + # custom for vpp_device + i40e: "2.25.11" + iavf: "4.11.3" + nvm: "8.70" dpdk22.07: # https://doc.dpdk.org/guides/rel_notes/release_22_07.html i40e: "2.19.3" @@ -89,6 +94,7 @@ intel_qat_compatibility_matrix: intel_i40e_url: "2.19.3": "i40e%20stable/2.19.3/i40e-2.19.3.tar.gz/download" "2.23.17": "i40e%20stable/2.23.17/i40e-2.23.17.tar.gz/download" + "2.25.11": "i40e%20stable/2.25.11/i40e-2.25.11.tar.gz/download" intel_ice_url: "1.9.7": "ice%20stable/1.9.7/ice-1.9.7.tar.gz/download" diff --git a/fdio.infra.ansible/roles/mellanox/defaults/main.yaml b/fdio.infra.ansible/roles/mellanox/defaults/main.yaml index de66be2d6b..fae5551c22 100644 --- a/fdio.infra.ansible/roles/mellanox/defaults/main.yaml +++ b/fdio.infra.ansible/roles/mellanox/defaults/main.yaml @@ -27,4 +27,4 @@ mellanox_compatibility_matrix: ofed: "5.9-0.5.6.0" dpdk23.11: # https://doc.dpdk.org/guides/rel_notes/release_23_11.html - ofed: "23.07-0.5.0.0" + ofed: "24.04-0.7.0.0" diff --git a/fdio.infra.ansible/vpp_device.yaml b/fdio.infra.ansible/vpp_device.yaml index 21676811c7..61c8016d0a 100644 --- a/fdio.infra.ansible/vpp_device.yaml +++ b/fdio.infra.ansible/vpp_device.yaml @@ -22,6 +22,8 @@ # tags: kernel - role: intel tags: intel + - role: mellanox + tags: mellanox - role: docker tags: docker - role: docker_images |