Build DOCA-OFED kernel modules for Rocky 10

Author: owenjones

.github/workflows/package-build-ofed.yml

@@ -12,7 +12,7 @@
       changed_when: false
       check_mode: true
       register: result
-      failed_when: result.found
+      failed_when: result.found > 0
 
     - name: Install package dependencies
       ansible.builtin.dnf:

etc/kayobe/ansible/tools/build-ofed-rocky.yml

@@ -6,8 +6,9 @@
   vars:
     # we don't build kernel modules for each version, eg 5.14.0-611.13.1 has been built,
     # but not 5.14.0-611.20.1
+    doca_release: "{{ os_release }}.{{ lookup('vars', 'stackhpc_pulp_repo_rocky_' ~ os_release ~ '_minor_version') }}"
     doca_kernel_arch: "{{ 'x86.64' if ansible_facts.architecture == 'x86_64' else ansible_facts.architecture }}"
-    doca_kernel_version: "{{ stackhpc_doca_kernel_version_matrix[stackhpc_pulp_repo_rocky_9_minor_version | string] }}.{{ doca_kernel_arch }}"
+    doca_kernel_version: "{{ stackhpc_doca_kernel_version_matrix[doca_release | string] }}.{{ doca_kernel_arch }}"
   tasks:
     - name: Install kernel repo
       ansible.builtin.dnf:

etc/kayobe/ansible/tools/install-doca.yml

@@ -7,13 +7,13 @@
   tasks:
     - name: Get OFED module repo
       ansible.builtin.set_fact:
-        doca_modules_repos: "{{ stackhpc_pulp_rpm_repos | selectattr('name', 'search', 'OFED') | selectattr('base_path', 'search', '/' ~ kolla_base_arch ~ '/') | list }}"
+        doca_modules_repos: "{{ stackhpc_pulp_rpm_repos | selectattr('name', 'search', 'OFED') | selectattr('base_path', 'search', '/rhel' ~ os_release) | selectattr('base_path', 'search', '/' ~ os_arch ~ '/') | list }}"
 
     - name: Assert OFED module repo is unique
       ansible.builtin.assert:
         that:
           - doca_modules_repos | length == 1
-        fail_msg: "Expected exactly one OFED module repo for {{ kolla_base_arch }}"
+        fail_msg: "Expected exactly one OFED module repo for {{ os_arch }}"
 
     - name: Get OFED module repo variables
       ansible.builtin.set_fact:
@@ -60,15 +60,20 @@
       retries: "{{ pulp_timeout_retries | default(3) }}"
 
     - name: Upload OFED RPMs to Pulp
-      ansible.builtin.shell:
-        cmd: |
-          {{ venv }}/bin/pulp \
-          rpm content \
-          --type package upload \
-          --repository '{{ doca_modules_repo_name }}' \
-          --file {{ item }} \
-          --no-publish \
+      pulp.squeezer.rpm_package:
+        pulp_url: "{{ stackhpc_release_pulp_url }}"
+        username: "{{ stackhpc_release_pulp_username }}"
+        password: "{{ stackhpc_release_pulp_password }}"
+        file: "{{ item }}"
+        chunk_size: 4194304
+        repository: "{{ doca_modules_repo_name }}"
+        state: present
       with_items: "{{ doca_kernel_repo.stdout_lines }}"
+      register: package
+
+    - name: Display information about the uploaded rpm
+      debug:
+        var: package
 
     - name: Create Pulp publication for OFED
       pulp.squeezer.rpm_publication:

etc/kayobe/ansible/tools/push-ofed.yml

@@ -75,23 +75,22 @@ dnf_custom_repos_doca_rocky_9:
 dnf_custom_repos_doca_rocky_10:
   doca:
     baseurl: "{{ stackhpc_repo_rhel10_doca_url }}"
-    description: "DOCA Online Repo {{ stackhpc_pulp_doca_version }} - RHEL $releasever"
+    description: "DOCA Online Repo 3.2.2 - RHEL $releasever"
     enabled: "{{ dnf_enable_doca | bool | default(false) }}"
     priority: -1
     file: doca
     gpgcheck: no
     username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
     password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
-    # TODO(owenjones): update this once repo for Rocky 10 has been created in Pulp
-    # doca-modules:
-    #   baseurl: "{{ stackhpc_repo_rhel9_doca_modules_url }}"
-    #   description: "OFED Kernel module repository for DOCA {{ stackhpc_pulp_doca_version }} - RHEL $releasever"
-    #   enabled: "{{ dnf_enable_doca_modules | bool | default(false) }}"
-    #   priority: -1
-    #   file: doca
-    #   gpgcheck: no
-    #   username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
-    #   password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
+  doca-modules:
+    baseurl: "{{ stackhpc_repo_rhel10_doca_modules_url }}"
+    description: "OFED Kernel module repository for DOCA 3.2.2 - RHEL $releasever"
+    enabled: "{{ dnf_enable_doca_modules | bool | default(false) }}"
+    priority: -1
+    file: doca
+    gpgcheck: no
+    username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
+    password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
 
 # Custom repositories shared between all RHEL 9/10 derivatives.
 dnf_custom_repos_el9:

etc/kayobe/dnf.yml

@@ -45,6 +45,7 @@ stackhpc_repo_rhel_10_mariadb_10_11_version: "{{ stackhpc_pulp_repo_multiarch_rh
 stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_multiarch_rhel_9_influxdb_version }}"
 stackhpc_repo_rhel_9_mariadb_10_11_version: "{{ stackhpc_pulp_repo_multiarch_rhel_9_mariadb_10_11_version }}"
 stackhpc_repo_rhel_9_treasuredata_5_version: "{{ stackhpc_pulp_repo_multiarch_rhel_9_treasuredata_5_version }}"
+stackhpc_repo_rhel10_doca_modules_version: "{{ stackhpc_pulp_repo_rhel10_doca_modules_version }}" 
 stackhpc_repo_rhel10_doca_version: "{{ stackhpc_pulp_repo_rhel10_doca_version }}"
 stackhpc_repo_rhel9_doca_modules_version: "{{ stackhpc_pulp_repo_rhel9_doca_modules_version }}"
 stackhpc_repo_rhel9_doca_version: "{{ stackhpc_pulp_repo_rhel9_doca_version }}"

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

@@ -6,12 +6,13 @@
 stackhpc_pulp_doca_version_matrix:
     "6": 2.9.3
     "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') }}"
+stackhpc_pulp_doca_version: "{{ stackhpc_pulp_doca_version_matrix[stackhpc_pulp_repo_rocky_9_minor_version | string] | default('2.9.3') }}"
 
 # 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
-    "7": 5.14.0.611.41.1.el9.7
+    "9.6": 5.14.0.570.21.1.el9.6
+    "9.7": 5.14.0.611.41.1.el9.7
+    "10.1": 6.12.0-124.45.1.el10_1
 
 ###############################################################################
 # Pulp configuration for DOCA OFED
@@ -22,15 +23,23 @@ 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_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"
-doca_modules_aarch64_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_aarch64_version"
+doca_rocky_9_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel{{ doca_rocky_9_minor_dot | replace('.', '_') }}_version"
+doca_rocky_9_modules_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_version"
+doca_rocky_9_modules_aarch64_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_version | replace('.', '_') }}_rhel9_{{ stackhpc_pulp_repo_rocky_9_minor_version }}_modules_aarch64_version"
+
+doca_rocky_10_version_lookup_var: "stackhpc_pulp_repo_doca_3_2_2_rhel10_{{ kolla_base_arch }}_version"
+doca_rocky_10_modules_version_lookup_var: "stackhpc_pulp_repo_doca_3_2_2_rhel10_modules_version"
+doca_rocky_10_modules_aarch64_version_lookup_var: "stackhpc_pulp_repo_doca_3_2_2_rhel10_modules_aarch64_version"
 
 # DOCA Snapshot versions. The defaults use the appropriate version from
 # pulp-repo-versions.yml
-stackhpc_pulp_repo_rhel9_doca_version: "{{ lookup('vars', doca_version_lookup_var) }}"
-stackhpc_pulp_repo_rhel9_doca_modules_version: "{{ lookup('vars', doca_modules_version_lookup_var) }}"
-stackhpc_pulp_repo_rhel9_doca_modules_aarch64_version: "{{ lookup('vars', doca_modules_aarch64_version_lookup_var) }}"
+stackhpc_pulp_repo_rhel9_doca_version: "{{ lookup('vars', doca_rocky_9_version_lookup_var) }}"
+stackhpc_pulp_repo_rhel9_doca_modules_version: "{{ lookup('vars', doca_rocky_9_modules_version_lookup_var) }}"
+stackhpc_pulp_repo_rhel9_doca_modules_aarch64_version: "{{ lookup('vars', doca_rocky_9_modules_aarch64_version_lookup_var) }}"
+
+stackhpc_pulp_repo_rhel10_doca_version: "{{ lookup('vars', doca_rocky_10_version_lookup_var) }}"
+stackhpc_pulp_repo_rhel10_doca_modules_version: "{{ lookup('vars', doca_rocky_10_modules_version_lookup_var) }}"
+stackhpc_pulp_repo_rhel10_doca_modules_aarch64_version: "{{ lookup('vars', doca_rocky_10_modules_aarch64_version_lookup_var) }}"
 
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.

etc/kayobe/ofed.yml

@@ -28,6 +28,8 @@ 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_2_rhel10_modules_aarch64_version:
+stackhpc_pulp_repo_doca_3_2_2_rhel10_modules_version:
 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_aarch64_version: 20260424T151043

etc/kayobe/pulp-repo-versions.yml

@@ -527,7 +527,7 @@ stackhpc_pulp_rpm_repos:
 
   - 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-"
+    distribution_name: "doca-3.2.2-rhel10-x86_64-"
     base_path: "doca/3.2.2/rhel10/x86_64/"
     required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_10 | bool }}"
 
@@ -537,6 +537,18 @@ stackhpc_pulp_rpm_repos:
     base_path: "doca/3.2.2/rhel10/aarch64/"
     required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_10 | bool }}"
 
+  - name: OFED Kernel modules for DOCA 3.2.2 - RHEL 10
+    url: "{{ stackhpc_release_pulp_content_url }}/doca-modules/3.2.2/rhel10/x86_64/{{ stackhpc_pulp_repo_rhel10_doca_modules_version }}"
+    distribution_name: "doca-modules-3.2.2-rhel10-"
+    base_path: "doca-modules/3.2.2/rhel10/x86_64/"
+    required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_10 | bool }}"
+
+  - name: OFED Kernel modules for DOCA 3.2.2 - RHEL 10 aarch64
+    url: "{{ stackhpc_release_pulp_content_url }}/doca-modules/3.2.2/rhel10/aarch64/{{ stackhpc_pulp_repo_rhel10_doca_modules_aarch64_version }}"
+    distribution_name: "doca-modules-3.2.2-rhel10-aarch64-"
+    base_path: "doca-modules/3.2.2/rhel10/aarch64/"
+    required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_10 | bool }}"
+
 # RPM repositories
 stackhpc_pulp_repository_rpm_repos: >-
   {%- set rpm_repos = [] -%}

etc/kayobe/pulp.yml

@@ -209,6 +209,10 @@ stackhpc_repo_rhel_10_mariadb_10_11_version: "{{ stackhpc_repo_distribution }}"
 stackhpc_repo_rhel10_doca_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/doca/3.2.2/rhel10/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel10_doca_version }}"
 stackhpc_repo_rhel10_doca_version: "{{ stackhpc_repo_distribution }}"
 
+# DOCA Modules for RHEL 10
+stackhpc_repo_rhel10_doca_modules_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/doca-modules/3.2.2/rhel10/{{ kolla_base_arch }}/{{ stackhpc_repo_rhel10_doca_modules_version }}"
+stackhpc_repo_rhel10_doca_modules_version: "{{ stackhpc_repo_distribution }}"
+
 ###############################################################################
 # Sources