Skip to content

Commit 6fe7592

Browse files
committed
Add error handling and logging to NVIDIA repository setup
- Add error messages for unsupported OS versions and CPU architectures - Change local readonly to readonly for nvidia repo paths to fix scope issues - Add early returns when encountering unsupported configurations - Improve TODO comments for better clarity - Fix typo: "locatl" -> "local" in mariner script Signed-off-by: Suraj Deshmukh <suraj.deshmukh@microsoft.com>
1 parent f4ebe34 commit 6fe7592

2 files changed

Lines changed: 15 additions & 11 deletions

File tree

parts/linux/cloud-init/artifacts/mariner/cse_install_mariner.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,12 @@ installCredentialProviderFromPMC() {
170170
}
171171

172172
updateDnfWithNvidiaPkg() {
173-
local readonly nvidia_repo_path="/etc/yum.repos.d/nvidia-built-azurelinux.repo"
173+
readonly nvidia_repo_path="/etc/yum.repos.d/nvidia-built-azurelinux.repo"
174174

175175
if [ "$OS_VERSION" != "3.0" ]; then
176-
# TODO
177-
# Error out?
176+
# TODO: Error out?
177+
echo "NVIDIA repo setup is only supported on Azure Linux 3.0"
178+
return
178179
fi
179180

180181
local cpu_arch=$(getCPUArch) # Returns amd64 or arm64
@@ -185,8 +186,9 @@ updateDnfWithNvidiaPkg() {
185186
elif [ "$cpu_arch" = "arm64" ]; then
186187
repo_arch="sbsa"
187188
else
188-
# TODO
189-
# Error out?
189+
# TODO: Error out?
190+
echo "Unsupported CPU architecture: $cpu_arch"
191+
return
190192
fi
191193

192194
locatl nvidia_repo_url="https://developer.download.nvidia.com/compute/cuda/repos/azl3/${repo_arch}/cuda-azl3.repo"

parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ updateAptWithMicrosoftPkg() {
7777
}
7878

7979
updateAptWithNvidiaPkg() {
80-
local readonly nvidia_gpg_keyring_path="/etc/apt/keyrings/nvidia.pub"
80+
readonly nvidia_gpg_keyring_path="/etc/apt/keyrings/nvidia.pub"
8181
mkdir -p "$(dirname "${nvidia_gpg_keyring_path}")"
8282

83-
local readonly nvidia_sources_list_path="/etc/apt/sources.list.d/nvidia.list"
83+
readonly nvidia_sources_list_path="/etc/apt/sources.list.d/nvidia.list"
8484
local cpu_arch=$(getCPUArch) # Returns amd64 or arm64
8585
local repo_arch=""
8686
local nvidia_ubuntu_release=""
@@ -90,17 +90,19 @@ updateAptWithNvidiaPkg() {
9090
elif [ "$cpu_arch" = "arm64" ]; then
9191
repo_arch="sbsa"
9292
else
93-
# TODO
94-
# Error out?
93+
# TODO: Error out?
94+
echo "Unknown CPU architecture: ${cpu_arch}"
95+
return
9596
fi
9697

9798
if [ "${UBUNTU_RELEASE}" = "22.04" ]; then
9899
nvidia_ubuntu_release="ubuntu2204"
99100
elif [ "${UBUNTU_RELEASE}" = "24.04" ]; then
100101
nvidia_ubuntu_release="ubuntu2404"
101102
else
102-
# TODO
103-
# Error out?
103+
# TODO: Error out?
104+
echo "Unsupported Ubuntu version for NVIDIA drivers: ${UBUNTU_RELEASE}"
105+
return
104106
fi
105107

106108
# Construct URLs based on detected architecture and Ubuntu version

0 commit comments

Comments
 (0)