Skip to content

Commit c79c11c

Browse files
committed
Build DOCA-OFED for Rocky 10
1 parent 3aa22a1 commit c79c11c

2 files changed

Lines changed: 33 additions & 19 deletions

File tree

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

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ name: Build OFED kernel modules
33
on:
44
workflow_dispatch:
55
inputs:
6-
rocky9:
7-
description: Build Rocky Linux 9
8-
type: boolean
9-
default: true
6+
release:
7+
description: Rocky Release
8+
type: choice
9+
default: Rocky 9
10+
options:
11+
- Rocky 9
12+
- Rocky 10
1013
secrets:
1114
KAYOBE_VAULT_PASSWORD_CI_BUILDER:
1215
required: true
@@ -77,14 +80,21 @@ jobs:
7780
- name: Output image tag
7881
id: image_tag
7982
run: |
80-
echo image_tag=$(grep stackhpc_rocky_9_overcloud_host_image_version: etc/kayobe/pulp-host-image-versions.yml | awk '{print $2}') >> $GITHUB_OUTPUT
83+
if [[ "${{ inputs.release }}" == "Rocky 9" ]]; then
84+
echo image_tag=$(grep stackhpc_rocky_9_overcloud_host_image_version: etc/kayobe/pulp-host-image-versions.yml | awk '{print $2}') >> $GITHUB_OUTPUT
85+
elif [[ "${{ inputs.release }}" == "Rocky 10" ]]; then
86+
echo image_tag=$(grep stackhpc_rocky_10_overcloud_host_image_version: etc/kayobe/pulp-host-image-versions.yml | awk '{print $2}') >> $GITHUB_OUTPUT
87+
fi
8188
working-directory: ${{ github.workspace }}/src/kayobe-config
8289

83-
# Use the image override if set, otherwise use overcloud-os_distribution-os_release-tag
8490
- name: Output image name
8591
id: image_name
8692
run: |
87-
echo image_name=overcloud-rocky-9-${{ steps.image_tag.outputs.image_tag }} >> $GITHUB_OUTPUT
93+
if [[ "${{ inputs.release }}" == "Rocky 9" ]]; then
94+
echo image_name=overcloud-rocky-9-${{ steps.image_tag.outputs.image_tag }} >> $GITHUB_OUTPUT
95+
elif [[ "${{ inputs.release }}" == "Rocky 10" ]]; then
96+
echo image_name=overcloud-rocky-10-${{ steps.image_tag.outputs.image_tag }} >> $GITHUB_OUTPUT
97+
fi
8898
8999
- name: Generate terraform.tfvars
90100
run: |
@@ -231,14 +241,14 @@ jobs:
231241
env:
232242
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
233243

234-
- name: Run OFED upload playbook
235-
run: |
236-
source venvs/kayobe/bin/activate &&
237-
source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
238-
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/tools/push-ofed.yml \
239-
-e "ofed_tag=${{ steps.ofed_tag.outputs.ofed_tag }}"
240-
env:
241-
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
244+
# - name: Run OFED upload playbook
245+
# run: |
246+
# source venvs/kayobe/bin/activate &&
247+
# source src/kayobe-config/kayobe-env --environment ci-doca-builder &&
248+
# kayobe playbook run src/kayobe-config/etc/kayobe/ansible/tools/push-ofed.yml \
249+
# -e "ofed_tag=${{ steps.ofed_tag.outputs.ofed_tag }}"
250+
# env:
251+
# KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD_CI_BUILDER }}
242252

243253
- name: Destroy
244254
run: terraform destroy -auto-approve

etc/kayobe/ofed.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
###############################################################################
55
# DOCA host version
66
stackhpc_pulp_doca_version_matrix:
7-
"6": 2.9.3
8-
"7": 3.2.2
7+
"9.6": 2.9.3
8+
"9.7": 3.2.2
9+
"10.1": 3.2.2
10+
911
stackhpc_pulp_doca_version: "{{ stackhpc_pulp_doca_version_matrix[stackhpc_pulp_repo_rocky_9_minor_version | string] | default('2.9.1') }}"
1012

1113
# Available and tested versions of the pre-compiled doca-ofed kernel modules
1214
stackhpc_doca_kernel_version_matrix:
13-
"6": 5.14.0.570.21.1.el9.6.x86.64
14-
"7": 5.14.0.611.41.1.el9.7.x86.64
15+
"9.6": 5.14.0.570.21.1.el9.6.x86.64
16+
"9.7": 5.14.0.611.41.1.el9.7.x86.64
1517

1618
###############################################################################
1719
# Pulp configuration for DOCA OFED
@@ -30,6 +32,8 @@ doca_modules_version_lookup_var: "stackhpc_pulp_repo_doca_{{ stackhpc_pulp_doca_
3032
stackhpc_pulp_repo_rhel9_doca_version: "{{ lookup('vars', doca_version_lookup_var) }}"
3133
stackhpc_pulp_repo_rhel9_doca_modules_version: "{{ lookup('vars', doca_modules_version_lookup_var) }}"
3234

35+
tackhpc_pulp_repo_rhel10_doca_version: "{{ stackhpc_pulp_repo_doca_3_2_2_rhel10_x86_64_version }}"
36+
3337
###############################################################################
3438
# Dummy variable to allow Ansible to accept this file.
3539
workaround_ansible_issue_8743: yes

0 commit comments

Comments
 (0)