From 74cf495036ef2b9b68953a7cda77a26047abf270 Mon Sep 17 00:00:00 2001
From: Amelia Crate <95060558+a-crate@users.noreply.github.com>
Date: Wed, 20 Nov 2024 00:27:24 +0000
Subject: [PATCH] Use packages for repo configuration instead of writing it
 manually (#2412)

---
 ...ocky_linux_8_optimized_gcp_accelerator.cfg | 29 ++----------------
 ...ocky_linux_9_optimized_gcp_accelerator.cfg | 30 +++----------------
 2 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/daisy_workflows/image_build/enterprise_linux/kickstart/rocky_linux_8_optimized_gcp_accelerator.cfg b/daisy_workflows/image_build/enterprise_linux/kickstart/rocky_linux_8_optimized_gcp_accelerator.cfg
index 92362fb4c..a2ea922dd 100644
--- a/daisy_workflows/image_build/enterprise_linux/kickstart/rocky_linux_8_optimized_gcp_accelerator.cfg
+++ b/daisy_workflows/image_build/enterprise_linux/kickstart/rocky_linux_8_optimized_gcp_accelerator.cfg
@@ -184,33 +184,10 @@ dnf install -y google-compute-engine google-osconfig-agent gce-disk-expand
 dnf install -y google-cloud-cli
 
 # Install Accelerator components: nvidia and mellanox drivers
-tee -a /etc/yum.repos.d/Rocky-OpenGPU.repo << EOM
-[open-gpu-kernel-modules-el8-x86_64]
-name = Open gpu kernel modules (x86_64)
-baseurl = https://depot.ciq.com/public/files/gce-accelerator/open-gpu-kernel-modules-el8-x86_64
-metadata_expire = 5
-priority = 50
-repo_gpgcheck = false
-gpgcheck = false
-enabled = true
-skip_if_unavailable = true
-EOM
-tee -a /etc/yum.repos.d/Rocky-Mlx.repo << EOM
-[nvidia-mellanox-ofed-driver-el8-x86_64]
-name = Nvidia Mellanox OFED Drivers
-baseurl = https://depot.ciq.com/public/files/gce-accelerator/nvidia-mellanox-ofed-driver-el8-x86_64
-metadata_expire = 5
-priority = 50
-repo_gpgcheck = false
-gpgcheck = false
-enabled = true
-skip_if_unavailable = true
-EOM
-
+dnf install -y https://depot.ciq.com/public/files/gce-accelerator/open-gpu-kernel-modules-el8-x86_64/nvidia-open-gpu-repos.noarch.rpm https://depot.ciq.com/public/files/gce-accelerator/open-gpu-kernel-modules-el8-x86_64/nvidia-mellanox-ofed-repos.noarch.rpm
 dnf config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel8/x86_64/cuda-rhel8.repo
-dnf install -y nvidia-open-gpu-kernel-modules
-dnf install -y nvidia-accelerated-graphics-driver
-dnf install -y mlnx-ofed-guest
+
+dnf install -y nvidia-open-gpu-kernel-modules nvidia-accelerated-graphics-driver mlnx-ofed-guest
 
 # Send /root/anaconda-ks.cfg to our logs.
 cp /run/install/ks.cfg /tmp/anaconda-ks.cfg
diff --git a/daisy_workflows/image_build/enterprise_linux/kickstart/rocky_linux_9_optimized_gcp_accelerator.cfg b/daisy_workflows/image_build/enterprise_linux/kickstart/rocky_linux_9_optimized_gcp_accelerator.cfg
index b4e9772e8..2afe07564 100644
--- a/daisy_workflows/image_build/enterprise_linux/kickstart/rocky_linux_9_optimized_gcp_accelerator.cfg
+++ b/daisy_workflows/image_build/enterprise_linux/kickstart/rocky_linux_9_optimized_gcp_accelerator.cfg
@@ -183,33 +183,11 @@ rpm -q google-compute-engine google-osconfig-agent gce-disk-expand || { echo "Bu
 dnf install -y google-cloud-cli
 
 # Install Accelerator components: nvidia and mellanox drivers
-tee -a /etc/yum.repos.d/Rocky-OpenGPU.repo << EOM
-[open-gpu-kernel-modules-el9-x86_64]
-name = Open gpu kernel modules (x86_64)
-baseurl = https://depot.ciq.com/public/files/gce-accelerator/open-gpu-kernel-modules-el9-x86_64
-metadata_expire = 5
-priority = 50
-repo_gpgcheck = false
-gpgcheck = false
-enabled = true
-skip_if_unavailable = true
-EOM
-tee -a /etc/yum.repos.d/Rocky-Mlx.repo << EOM
-[nvidia-mellanox-ofed-driver-el9-x86_64]
-name = Nvidia Mellanox OFED Drivers
-baseurl = https://depot.ciq.com/public/files/gce-accelerator/nvidia-mellanox-ofed-driver-el9-x86_64
-metadata_expire = 5
-priority = 50
-repo_gpgcheck = false
-gpgcheck = false
-enabled = true
-skip_if_unavailable = true
-EOM
-
+dnf install -y https://depot.ciq.com/public/files/gce-accelerator/open-gpu-kernel-modules-el9-x86_64/nvidia-open-gpu-repos.noarch.rpm https://depot.ciq.com/public/files/gce-accelerator/open-gpu-kernel-modules-el9-x86_64/nvidia-mellanox-ofed-repos.noarch.rpm
 dnf config-manager --add-repo https://developer.download.nvidia.com/compute/cuda/repos/rhel9/x86_64/cuda-rhel9.repo
-dnf install -y nvidia-open-gpu-kernel-modules
-dnf install -y nvidia-accelerated-graphics-driver
-dnf install -y mlnx-ofed-guest
+
+dnf install -y nvidia-open-gpu-kernel-modules nvidia-accelerated-graphics-driver mlnx-ofed-guest
+
 
 # Send /root/anaconda-ks.cfg to our logs.
 cp /run/install/ks.cfg /tmp/anaconda-ks.cfg