Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions etc/kayobe/ofed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
# DOCA host version
stackhpc_pulp_doca_version_matrix:
"6": 2.9.3
"7": 3.2.1
"7": 3.2.2
stackhpc_pulp_doca_version: "{{ stackhpc_pulp_doca_version_matrix[stackhpc_pulp_repo_rocky_9_minor_version | string] | default('2.9.1') }}"

# Available and tested versions of the pre-compiled doca-ofed kernel modules
stackhpc_doca_kernel_version_matrix:
"6": 5.14.0.570.21.1.el9.6.x86.64
"7": 5.14.0.611.13.1.el9.7.x86.64
"7": 5.14.0.611.36.1.el9.7.x86.64

###############################################################################
# Pulp configuration for DOCA OFED
Expand All @@ -21,7 +21,7 @@ stackhpc_pulp_sync_ofed: "{{ groups['mlnx'] | length > 0 }}"

# DOCA Snapshot lookup vars
doca_rocky_9_minor_dot: "{% if stackhpc_pulp_doca_version is version('3.2.0', '>=') %}9{% else %}9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}{% endif %}"
# eg stackhpc_pulp_repo_doca_2_9_3_rhel9_6_version or stackhpc_pulp_repo_doca_3_2_1_rhel9_version
# eg stackhpc_pulp_repo_doca_2_9_3_rhel9_6_version or stackhpc_pulp_repo_doca_3_2_2_rhel9_version
doca_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel{{ doca_rocky_9_minor_dot | replace('.', '_') }}_version"
doca_modules_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_version"

Expand Down
118 changes: 59 additions & 59 deletions etc/kayobe/pulp-repo-versions.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
# This file is autogenerated by Ansible using the following workflow:
# https://github.com/stackhpc/stackhpc-release-train/actions/workflows/package-update-kayobe.yml
stackhpc_pulp_repo_almalinux_9_proxysql_2_7_version: 20250627T134211
stackhpc_pulp_repo_centos_stream_10_docker_aarch64_version: 20260220T152827
stackhpc_pulp_repo_centos_stream_10_docker_version: 20260220T152827
stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_aarch64_version: 20260220T152827
stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_version: 20260220T152827
stackhpc_pulp_repo_centos_stream_10_docker_aarch64_version: 20260325T220756
stackhpc_pulp_repo_centos_stream_10_docker_version: 20260325T202053
stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_aarch64_version: 20260320T220155
stackhpc_pulp_repo_centos_stream_10_nfv_openvswitch_version: 20260324T212957
stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_aarch64_version: 20260227T222400
stackhpc_pulp_repo_centos_stream_10_openstack_epoxy_version: 20260227T214730
stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_aarch64_version: 20260220T152827
stackhpc_pulp_repo_centos_stream_10_storage_ceph_squid_version: 20260220T152827
stackhpc_pulp_repo_centos_stream_9_docker_aarch64_version: 20260202T213000
stackhpc_pulp_repo_centos_stream_9_docker_version: 20260202T201529
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_aarch64_version: 20260202T213000
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20260202T211958
stackhpc_pulp_repo_centos_stream_9_docker_aarch64_version: 20260325T213129
stackhpc_pulp_repo_centos_stream_9_docker_version: 20260325T202053
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_aarch64_version: 20260319T213811
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20260319T212811
stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_aarch64_version: 20250521T015033
stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version: 20250521T021940
stackhpc_pulp_repo_centos_stream_9_opstools_aarch64_version: 20240927T073838
Expand All @@ -26,49 +26,49 @@ stackhpc_pulp_repo_doca_2_9_1_rhel9_5_modules_version: 20250115T150314
stackhpc_pulp_repo_doca_2_9_1_rhel9_5_version: 20241211T171301
stackhpc_pulp_repo_doca_2_9_3_rhel9_6_modules_version: 20250714T141841
stackhpc_pulp_repo_doca_2_9_3_rhel9_6_version: 20250703T135021
stackhpc_pulp_repo_doca_3_2_1_rhel10_aarch64_version: 20260220T152827
stackhpc_pulp_repo_doca_3_2_1_rhel10_x86_64_version: 20260220T152827
stackhpc_pulp_repo_doca_3_2_1_rhel9_7_modules_version: 20251222T160623
stackhpc_pulp_repo_doca_3_2_1_rhel9_version: 20251219T132023
stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20260204T212153
stackhpc_pulp_repo_doca_3_2_2_rhel10_aarch64_version: 20260326T091359
stackhpc_pulp_repo_doca_3_2_2_rhel10_x86_64_version: 20260326T091359
stackhpc_pulp_repo_doca_3_2_2_rhel9_7_modules_version: 20260326T160846
stackhpc_pulp_repo_doca_3_2_2_rhel9_version: 20260326T091359
stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20260325T202053
stackhpc_pulp_repo_elrepo_10_aarch64_version: 20260220T152827
stackhpc_pulp_repo_elrepo_10_version: 20260220T152827
stackhpc_pulp_repo_elrepo_10_version: 20260318T213508
stackhpc_pulp_repo_elrepo_9_aarch64_version: 20250408T030629
stackhpc_pulp_repo_elrepo_9_version: 20260127T212055
stackhpc_pulp_repo_epel_10_aarch64_version: 20260222T221647
stackhpc_pulp_repo_epel_10_version: 20260221T212353
stackhpc_pulp_repo_epel_9_aarch64_version: 20260204T223146
stackhpc_pulp_repo_epel_9_version: 20260204T220346
stackhpc_pulp_repo_grafana_version: 20260214T213531
stackhpc_pulp_repo_opensearch_2_x_version: 20251106T202313
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20251106T202313
stackhpc_pulp_repo_elrepo_9_version: 20260320T212619
stackhpc_pulp_repo_epel_10_aarch64_version: 20260325T220756
stackhpc_pulp_repo_epel_10_version: 20260325T211302
stackhpc_pulp_repo_epel_9_aarch64_version: 20260325T213129
stackhpc_pulp_repo_epel_9_version: 20260325T211302
stackhpc_pulp_repo_grafana_version: 20260325T203007
stackhpc_pulp_repo_opensearch_2_x_version: 20260312T214445
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20260312T214445
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_26_aarch64_version: 20260112T224827
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_27_aarch64_version: 20260112T224827
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20251130T213625
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20260122T202504
stackhpc_pulp_repo_rhel9_rabbitmq_erlang_version: 20260317T203047
stackhpc_pulp_repo_rhel9_rabbitmq_server_version: 20260220T202834
stackhpc_pulp_repo_rhel_10_mariadb_10_11_aarch64_version: 20260220T152827
stackhpc_pulp_repo_rhel_10_mariadb_10_11_version: 20260220T152827
stackhpc_pulp_repo_rhel_9_influxdb_aarch64_version: 20260112T224827
stackhpc_pulp_repo_rhel_9_influxdb_version: 20260113T202459
stackhpc_pulp_repo_rhel_9_influxdb_version: 20260319T202709
stackhpc_pulp_repo_rhel_9_mariadb_10_11_aarch64_version: 20260204T223146
stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20260204T213517
stackhpc_pulp_repo_rhel_9_treasuredata_5_aarch64_version: 20251219T213344
stackhpc_pulp_repo_rhel_9_treasuredata_5_version: 20251219T202129
stackhpc_pulp_repo_rocky_10_1_appstream_aarch64_version: 20260221T224249
stackhpc_pulp_repo_rocky_10_1_appstream_source_version: 20260221T221101
stackhpc_pulp_repo_rocky_10_1_appstream_version: 20260221T220006
stackhpc_pulp_repo_rocky_10_1_baseos_aarch64_version: 20260221T224249
stackhpc_pulp_repo_rocky_10_1_baseos_source_version: 20260221T221101
stackhpc_pulp_repo_rocky_10_1_baseos_version: 20260221T222543
stackhpc_pulp_repo_rocky_10_1_crb_aarch64_version: 20260221T224249
stackhpc_pulp_repo_rocky_10_1_crb_source_version: 20260220T120402
stackhpc_pulp_repo_rocky_10_1_crb_version: 20260221T220006
stackhpc_pulp_repo_rocky_10_1_extras_aarch64_version: 20260220T120402
stackhpc_pulp_repo_rocky_10_1_extras_source_version: 20260220T120402
stackhpc_pulp_repo_rocky_10_1_extras_version: 20260220T120402
stackhpc_pulp_repo_rocky_10_1_highavailability_aarch64_version: 20260220T120402
stackhpc_pulp_repo_rocky_10_1_appstream_aarch64_version: 20260317T230004
stackhpc_pulp_repo_rocky_10_1_appstream_source_version: 20260317T223215
stackhpc_pulp_repo_rocky_10_1_appstream_version: 20260317T222158
stackhpc_pulp_repo_rocky_10_1_baseos_aarch64_version: 20260317T230004
stackhpc_pulp_repo_rocky_10_1_baseos_source_version: 20260317T223215
stackhpc_pulp_repo_rocky_10_1_baseos_version: 20260317T224922
stackhpc_pulp_repo_rocky_10_1_crb_aarch64_version: 20260317T230004
stackhpc_pulp_repo_rocky_10_1_crb_source_version: 20260311T223420
stackhpc_pulp_repo_rocky_10_1_crb_version: 20260317T222158
stackhpc_pulp_repo_rocky_10_1_extras_aarch64_version: 20260227T002947
stackhpc_pulp_repo_rocky_10_1_extras_source_version: 20260226T235612
stackhpc_pulp_repo_rocky_10_1_extras_version: 20260226T235218
stackhpc_pulp_repo_rocky_10_1_highavailability_aarch64_version: 20260227T002947
stackhpc_pulp_repo_rocky_10_1_highavailability_source_version: 20260220T120402
stackhpc_pulp_repo_rocky_10_1_highavailability_version: 20260220T120402
stackhpc_pulp_repo_rocky_10_1_highavailability_version: 20260226T235218
stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328
Expand Down Expand Up @@ -109,24 +109,24 @@ stackhpc_pulp_repo_rocky_9_6_extras_aarch64_version: 20250726T045704
stackhpc_pulp_repo_rocky_9_6_extras_version: 20250726T040613
stackhpc_pulp_repo_rocky_9_6_highavailability_aarch64_version: 20250605T150141
stackhpc_pulp_repo_rocky_9_6_highavailability_version: 20250605T150141
stackhpc_pulp_repo_rocky_9_7_appstream_aarch64_version: 20260224T214928
stackhpc_pulp_repo_rocky_9_7_appstream_source_version: 20260224T211933
stackhpc_pulp_repo_rocky_9_7_appstream_version: 20260224T210434
stackhpc_pulp_repo_rocky_9_7_baseos_aarch64_version: 20260224T214928
stackhpc_pulp_repo_rocky_9_7_baseos_source_version: 20260224T211933
stackhpc_pulp_repo_rocky_9_7_baseos_version: 20260224T213540
stackhpc_pulp_repo_rocky_9_7_crb_aarch64_version: 20260224T214928
stackhpc_pulp_repo_rocky_9_7_appstream_aarch64_version: 20260317T222441
stackhpc_pulp_repo_rocky_9_7_appstream_source_version: 20260313T213658
stackhpc_pulp_repo_rocky_9_7_appstream_version: 20260317T213704
stackhpc_pulp_repo_rocky_9_7_baseos_aarch64_version: 20260317T222441
stackhpc_pulp_repo_rocky_9_7_baseos_source_version: 20260317T215058
stackhpc_pulp_repo_rocky_9_7_baseos_version: 20260317T220526
stackhpc_pulp_repo_rocky_9_7_crb_aarch64_version: 20260317T222441
stackhpc_pulp_repo_rocky_9_7_crb_source_version: 20260208T212722
stackhpc_pulp_repo_rocky_9_7_crb_version: 20260224T210434
stackhpc_pulp_repo_rocky_9_7_extras_aarch64_version: 20251229T153210
stackhpc_pulp_repo_rocky_9_7_extras_source_version: 20251229T150242
stackhpc_pulp_repo_rocky_9_7_extras_version: 20251229T144024
stackhpc_pulp_repo_rocky_9_7_highavailability_aarch64_version: 20260212T231318
stackhpc_pulp_repo_rocky_9_7_highavailability_source_version: 20260212T230226
stackhpc_pulp_repo_rocky_9_7_highavailability_version: 20260213T205816
stackhpc_pulp_repo_rocky_9_sig_security_common_aarch64_version: 20251109T211404
stackhpc_pulp_repo_rocky_9_sig_security_common_source_version: 20251203T103807
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20251108T211425
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20260204T223745
stackhpc_pulp_repo_ubuntu_noble_security_version: 20260204T033200
stackhpc_pulp_repo_ubuntu_noble_version: 20260204T033200
stackhpc_pulp_repo_rocky_9_7_crb_version: 20260317T213704
stackhpc_pulp_repo_rocky_9_7_extras_aarch64_version: 20260226T234714
stackhpc_pulp_repo_rocky_9_7_extras_source_version: 20260226T232039
stackhpc_pulp_repo_rocky_9_7_extras_version: 20260226T231043
stackhpc_pulp_repo_rocky_9_7_highavailability_aarch64_version: 20260311T220038
stackhpc_pulp_repo_rocky_9_7_highavailability_source_version: 20260311T214515
stackhpc_pulp_repo_rocky_9_7_highavailability_version: 20260311T212129
stackhpc_pulp_repo_rocky_9_sig_security_common_aarch64_version: 20260305T225932
stackhpc_pulp_repo_rocky_9_sig_security_common_source_version: 20260305T224636
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20260305T222525
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20260325T220630
stackhpc_pulp_repo_ubuntu_noble_security_version: 20260326T044758
stackhpc_pulp_repo_ubuntu_noble_version: 20260326T044758
8 changes: 4 additions & 4 deletions etc/kayobe/pulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -505,10 +505,10 @@ stackhpc_pulp_rpm_repos:
base_path: "mariadb-10.11/yum/rhel/10/x86_64/"
required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_10 | bool }}"

- name: DOCA Online Repo 3.2.1 - RHEL 10
url: "{{ stackhpc_release_pulp_content_url }}/doca/3.2.1/rhel10/x86_64/{{ stackhpc_pulp_repo_doca_3_2_1_rhel10_x86_64_version }}"
distribution_name: "doca-3.2.1-rhel10-"
base_path: "doca/3.2.1/rhel10/x86_64/"
- name: DOCA Online Repo 3.2.2 - RHEL 10
url: "{{ stackhpc_release_pulp_content_url }}/doca/3.2.2/rhel10/x86_64/{{ stackhpc_pulp_repo_doca_3_2_2_rhel10_x86_64_version }}"
distribution_name: "doca-3.2.2-rhel10-"
base_path: "doca/3.2.2/rhel10/x86_64/"
required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_10 | bool }}"
Comment on lines +508 to 512
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The DOCA version 3.2.2 is hardcoded in name, url, distribution_name, and base_path. This makes future version updates more error-prone as the version needs to be changed in multiple places. For better maintainability, consider parameterizing the version using a variable, similar to how it's done for the RHEL 9 DOCA repository configuration in this file (lines 416-420).

References
  1. Define configuration variables to allow for overrides and improve maintainability, ensuring sensible defaults are used.


# RPM repositories
Expand Down
4 changes: 2 additions & 2 deletions etc/kayobe/stackhpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,8 @@ stackhpc_repo_centos_stream_10_docker_version: "{{ stackhpc_repo_distribution }}
stackhpc_repo_rhel_10_mariadb_10_11_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.11/yum/rhel/10/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel_10_mariadb_10_11_version }}"
stackhpc_repo_rhel_10_mariadb_10_11_version: "{{ stackhpc_repo_distribution }}"

# DOCA Repository 3.2.1 for RHEL 10
stackhpc_repo_rhel10_doca_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/doca/3.2.1/rhel10/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel10_doca_version }}"
# DOCA Repository 3.2.2 for RHEL 10
stackhpc_repo_rhel10_doca_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/doca/3.2.2/rhel10/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel10_doca_version }}"
Comment on lines +204 to +205
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The DOCA version 3.2.2 is hardcoded in the comment and the URL. For better maintainability, consider parameterizing it using a variable, similar to how it's done for the RHEL 9 DOCA repository configuration in this file (line 53). This would make future version bumps easier and ensure consistency.

References
  1. Define configuration variables to allow for overrides and improve maintainability, ensuring sensible defaults are used.

stackhpc_repo_rhel10_doca_version: "{{ stackhpc_repo_distribution }}"

###############################################################################
Expand Down
4 changes: 4 additions & 0 deletions releasenotes/notes/doca-ofed-3.2.2-89bafeec62809fa7.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
features:
- |
Updates to NVIDIA DOCA 3.2.2 LTS.
Loading