Skip to content

Commit 0030a24

Browse files
Install DOCA during builds
1 parent e0e90b2 commit 0030a24

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,11 @@ jobs:
197197
run: |
198198
source venvs/kayobe/bin/activate &&
199199
source src/kayobe-config/kayobe-env --environment ci-builder &&
200-
kayobe seed host configure --skip-tags network,docker,docker-registry -e seed_bootstrap_user="cloud-user"
200+
kayobe seed host configure \
201+
--skip-tags network,docker,docker-registry \
202+
-e seed_bootstrap_user="cloud-user" \
203+
-e dnf_install_doca=true \
204+
-e dnf_enable_doca_modules=false
201205
env:
202206
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
203207

etc/kayobe/dnf.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dnf_custom_repos_doca:
6565
description: "OFED Kernel modules for DOCA {{ stackhpc_pulp_doca_version }} - RHEL $releasever"
6666
enabled: "{{ dnf_enable_doca | bool and dnf_enable_doca_modules | bool }}"
6767
priority: -2
68-
file: doca-modules
68+
file: doca
6969
gpgcheck: no
7070
username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
7171
password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
@@ -157,7 +157,7 @@ dnf_enable_elrepo_9: "{{ dnf_install_elrepo_9 | bool }}"
157157
dnf_enable_doca: "{{ dnf_install_doca | bool }}"
158158

159159
# Whether to enable the DOCA kernel module repository. This affects RedHat-based systems only.
160-
dnf_enable_doca_modules: "{{ dnf_install_doca_modules | bool }}"
160+
dnf_enable_doca_modules: "{{ dnf_install_doca | bool }}"
161161

162162
# URL of EPEL GPG keys.
163163
dnf_epel_9_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-9"
@@ -179,10 +179,6 @@ dnf_enable_docker: true
179179
#URL of docker repo GPG key
180180
dnf_docker_gpg_key_url: "https://download.docker.com/linux/centos/gpg"
181181

182-
# Whether to create a repo file for DOCA kernel modules. This affects RedHat-based
183-
# systems only.
184-
dnf_install_doca_modules: "{{ dnf_install_doca | bool }}"
185-
186182
# Whether to create a repo file for DOCA. This affects RedHat-based
187183
# systems only.
188184
dnf_install_doca: false

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_vers
7575
stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
7676
stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
7777
stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_rocky_9_sig_security_common_version }}"
78+
stackhpc_repo_rhel9_doca_version: "{{ stackhpc_pulp_repo_rhel9_doca_version }}"
7879

7980
# Rocky-and-CI-specific Pulp urls
8081
stackhpc_include_os_minor_version_in_repo_url: true

etc/kayobe/pulp-repo-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240911T041957
4343
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240924T064114
4444
stackhpc_pulp_repo_ubuntu_jammy_version: 20240924T064114
4545
stackhpc_pulp_repo_ceph_reef_debian_version: 20240925T152022
46-
stackhpc_pulp_repo_rhel_9_4_doca_version: 20241112T162334
46+
stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
4747
stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241113T161507

0 commit comments

Comments
 (0)