From 0030a2427a8cb1c640ac45b34bd95f0fedef9afe Mon Sep 17 00:00:00 2001
From: Jake Hutchinson <jake@stackhpc.com>
Date: Thu, 12 Dec 2024 16:07:45 +0000
Subject: [PATCH] Install DOCA during builds

---
 .github/workflows/package-build-ofed.yml           | 6 +++++-
 etc/kayobe/dnf.yml                                 | 8 ++------
 etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 1 +
 etc/kayobe/pulp-repo-versions.yml                  | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/package-build-ofed.yml b/.github/workflows/package-build-ofed.yml
index eb3ad7eb8..3c247f690 100644
--- a/.github/workflows/package-build-ofed.yml
+++ b/.github/workflows/package-build-ofed.yml
@@ -197,7 +197,11 @@ jobs:
         run: |
           source venvs/kayobe/bin/activate &&
           source src/kayobe-config/kayobe-env --environment ci-builder &&
-          kayobe seed host configure --skip-tags network,docker,docker-registry -e seed_bootstrap_user="cloud-user"
+          kayobe seed host configure \
+          --skip-tags network,docker,docker-registry \
+          -e seed_bootstrap_user="cloud-user" \
+          -e dnf_install_doca=true \
+          -e dnf_enable_doca_modules=false
         env:
           KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
 
diff --git a/etc/kayobe/dnf.yml b/etc/kayobe/dnf.yml
index e200d030c..7ee3a8450 100644
--- a/etc/kayobe/dnf.yml
+++ b/etc/kayobe/dnf.yml
@@ -65,7 +65,7 @@ dnf_custom_repos_doca:
     description: "OFED Kernel modules for DOCA {{ stackhpc_pulp_doca_version }} - RHEL $releasever"
     enabled: "{{ dnf_enable_doca | bool and dnf_enable_doca_modules | bool }}"
     priority: -2
-    file: doca-modules
+    file: doca
     gpgcheck: no
     username: "{{ stackhpc_repo_mirror_username | default(omit, true) }}"
     password: "{{ stackhpc_repo_mirror_password | default(omit, true) }}"
@@ -157,7 +157,7 @@ dnf_enable_elrepo_9: "{{ dnf_install_elrepo_9 | bool }}"
 dnf_enable_doca: "{{ dnf_install_doca | bool }}"
 
 # Whether to enable the DOCA kernel module repository. This affects RedHat-based systems only.
-dnf_enable_doca_modules: "{{ dnf_install_doca_modules | bool }}"
+dnf_enable_doca_modules: "{{ dnf_install_doca | bool }}"
 
 # URL of EPEL GPG keys.
 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
 #URL of docker repo GPG key
 dnf_docker_gpg_key_url: "https://download.docker.com/linux/centos/gpg"
 
-# Whether to create a repo file for DOCA kernel modules. This affects RedHat-based
-# systems only.
-dnf_install_doca_modules: "{{ dnf_install_doca | bool }}"
-
 # Whether to create a repo file for DOCA. This affects RedHat-based
 # systems only.
 dnf_install_doca: false
diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
index 0fe57cff8..f06e1d1ee 100644
--- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
+++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml
@@ -75,6 +75,7 @@ stackhpc_repo_rocky_9_extras_version: "{{ stackhpc_pulp_repo_rocky_9_extras_vers
 stackhpc_repo_rocky_9_crb_version: "{{ stackhpc_pulp_repo_rocky_9_crb_version }}"
 stackhpc_repo_rocky_9_highavailability_version: "{{ stackhpc_pulp_repo_rocky_9_highavailability_version }}"
 stackhpc_repo_rocky_9_sig_security_common_version: "{{ stackhpc_pulp_repo_rocky_9_sig_security_common_version }}"
+stackhpc_repo_rhel9_doca_version: "{{ stackhpc_pulp_repo_rhel9_doca_version }}"
 
 # Rocky-and-CI-specific Pulp urls
 stackhpc_include_os_minor_version_in_repo_url: true
diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml
index 7bfea0ee2..0f97d455a 100644
--- a/etc/kayobe/pulp-repo-versions.yml
+++ b/etc/kayobe/pulp-repo-versions.yml
@@ -43,5 +43,5 @@ stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240911T041957
 stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240924T064114
 stackhpc_pulp_repo_ubuntu_jammy_version: 20240924T064114
 stackhpc_pulp_repo_ceph_reef_debian_version: 20240925T152022
-stackhpc_pulp_repo_rhel_9_4_doca_version: 20241112T162334
+stackhpc_pulp_repo_rhel_9_4_doca_version: 20241211T153620
 stackhpc_pulp_repo_rhel_9_4_doca_modules_version: 20241113T161507