Add R580 support for precompiled driver

Signed-off-by: Shiva Kumar (SW-CLOUD) <[email protected]>

Author: shivakunv

.common-ci.yml

@@ -99,15 +99,15 @@ trigger-pipeline:
 .driver-versions-precompiled-ubuntu22.04:
   parallel:
     matrix:
-      - DRIVER_BRANCH: [535, 570]
+      - DRIVER_BRANCH: [535, 570, 580]
         KERNEL_FLAVOR: [aws, azure, generic, nvidia, oracle]
         LTS_KERNEL: ["5.15", "6.8"]
 
 # Define the matrix of precompiled jobs that can be run in parallel for ubuntu24.04
 .driver-versions-precompiled-ubuntu24.04:
   parallel:
     matrix:
-      - DRIVER_BRANCH: [570]
+      - DRIVER_BRANCH: [570, 580]
         KERNEL_FLAVOR: [aws, azure, generic, nvidia, oracle]
         LTS_KERNEL: ["6.8"]
 

.github/workflows/image.yaml

@@ -107,6 +107,7 @@ jobs:
         driver: 
           - 535
           - 570
+          - 580
         flavor:
           - aws
           - azure

.github/workflows/precompiled.yaml

@@ -34,7 +34,7 @@ jobs:
         id: extract_driver_branch
         run: |
           # get driver_branch
-          DRIVER_BRANCH=("535" "570")
+          DRIVER_BRANCH=("535" "570" "580")
           driver_branch_json=$(printf '%s\n' "${DRIVER_BRANCH[@]}" | jq -R . | jq -cs .)
           echo "driver_branch=$driver_branch_json" >> $GITHUB_OUTPUT
 

ubuntu22.04/precompiled/Dockerfile

@@ -51,11 +51,6 @@ RUN if [ -n "${CVE_UPDATES}" ]; then \
         rm -rf /var/lib/apt/lists/*; \
     fi
 
-RUN if [ "$DRIVER_BRANCH" -ge "550" ]; then \
-    apt-get update && \
-    apt-get install -y --no-install-recommends nvidia-imex-${DRIVER_BRANCH}=${DRIVER_VERSION}-1 && \
-    rm -rf /var/lib/apt/lists/*; fi
-
 COPY nvidia-driver /usr/local/bin
 
 ADD local-repo.sh /tmp
@@ -64,6 +59,7 @@ RUN mkdir -p /usr/local/repos && \
     /tmp/local-repo.sh download_driver_package_deps && \
     /tmp/local-repo.sh build_local_apt_repo && \
     /tmp/local-repo.sh fetch_nvidia_installer && \
+    /tmp/local-repo.sh extra_pkgs_install && \
     # Remove cuda repository to avoid GPG errors
     rm -f /etc/apt/sources.list.d/cuda*
 

ubuntu22.04/precompiled/local-repo.sh

@@ -37,17 +37,20 @@ download_driver_package_deps () {
   download_apt_with_dep libnvidia-encode-${DRIVER_BRANCH}-server
   download_apt_with_dep libnvidia-fbc1-${DRIVER_BRANCH}-server
 
-  download_apt_with_dep nvidia-fabricmanager-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
-  download_apt_with_dep libnvidia-nscq-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
-
-  if [ "$DRIVER_BRANCH" -ge "550" ]; then
+  if [ "$DRIVER_BRANCH" -ge "580" ]; then
+    download_apt_with_dep nvidia-imex=${DRIVER_VERSION}-1
+    download_apt_with_dep nvidia-fabricmanager=${DRIVER_VERSION}-1
+    download_apt_with_dep libnvidia-nscq=${DRIVER_VERSION}-1
+    download_apt_with_dep libnvsdm=${DRIVER_VERSION}-1
+  else
+    if [ "$DRIVER_BRANCH" -ge "570" ]; then
+      download_apt_with_dep nvidia-imex-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
       download_apt_with_dep nvlsm
       download_apt_with_dep infiniband-diags
-      download_apt_with_dep nvidia-imex-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
-  fi
-
-  if [ "$DRIVER_BRANCH" -ge "560" ]; then
       download_apt_with_dep libnvsdm-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
+    fi
+    download_apt_with_dep nvidia-fabricmanager-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
+    download_apt_with_dep libnvidia-nscq-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
   fi
 
   ls -al .
@@ -71,12 +74,28 @@ fetch_nvidia_installer () {
   rm $DRIVER_RUN_FILE.run
 }
 
+imex_install() {
+  if [ "$DRIVER_BRANCH" -ge "580" ]; then
+    apt-get install -y --no-install-recommends nvidia-imex=${DRIVER_VERSION}-1
+  elif [ "$DRIVER_BRANCH" -ge "570" ]; then
+    apt-get install -y --no-install-recommends nvidia-imex-${DRIVER_BRANCH}=${DRIVER_VERSION}-1;
+  fi
+}
+
+extra_pkgs_install() {
+      apt-get update
+      imex_install
+      rm -rf /var/lib/apt/lists/*
+}
+
 if [ "$1" = "download_driver_package_deps" ]; then
   download_driver_package_deps
 elif [ "$1" = "build_local_apt_repo" ]; then
   build_local_apt_repo
 elif [ "$1" = "fetch_nvidia_installer" ]; then
   fetch_nvidia_installer
+elif [ "$1" = "extra_pkgs_install" ]; then
+  extra_pkgs_install
 else
   echo "Unknown function: $1"
   exit 1

ubuntu24.04/precompiled/Dockerfile

@@ -46,11 +46,6 @@ RUN if [ -n "${CVE_UPDATES}" ]; then \
         rm -rf /var/lib/apt/lists/*; \
     fi
 
-RUN if [ "$DRIVER_BRANCH" -ge "550" ]; then \
-    apt-get update && \
-    apt-get install -y --no-install-recommends nvidia-imex-${DRIVER_BRANCH}=${DRIVER_VERSION}-1 && \
-    rm -rf /var/lib/apt/lists/*; fi
-
 COPY nvidia-driver /usr/local/bin
 
 ADD local-repo.sh /tmp
@@ -59,6 +54,7 @@ RUN mkdir -p /usr/local/repos && \
     /tmp/local-repo.sh download_driver_package_deps && \
     /tmp/local-repo.sh build_local_apt_repo && \
     /tmp/local-repo.sh fetch_nvidia_installer && \
+    /tmp/local-repo.sh extra_pkgs_install && \
     # Remove all other ubuntu apt sources to ensure we only pull from the local apt repo
     rm /etc/apt/sources.list.d/*
 

ubuntu24.04/precompiled/local-repo.sh

@@ -37,17 +37,20 @@ download_driver_package_deps () {
   download_apt_with_dep libnvidia-encode-${DRIVER_BRANCH}-server
   download_apt_with_dep libnvidia-fbc1-${DRIVER_BRANCH}-server
 
-  download_apt_with_dep nvidia-fabricmanager-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
-  download_apt_with_dep libnvidia-nscq-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
-
-  if [ "$DRIVER_BRANCH" -ge "550" ]; then
+  if [ "$DRIVER_BRANCH" -ge "580" ]; then
+    download_apt_with_dep nvidia-imex=${DRIVER_VERSION}-1
+    download_apt_with_dep nvidia-fabricmanager=${DRIVER_VERSION}-1
+    download_apt_with_dep libnvidia-nscq=${DRIVER_VERSION}-1
+    download_apt_with_dep libnvsdm=${DRIVER_VERSION}-1
+  else
+    if [ "$DRIVER_BRANCH" -ge "570" ]; then
       download_apt_with_dep nvlsm
       download_apt_with_dep infiniband-diags
-      download_apt_with_dep nvidia-imex-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
-  fi
-
-  if [ "$DRIVER_BRANCH" -ge "560" ]; then
       download_apt_with_dep libnvsdm-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
+    fi
+    download_apt_with_dep nvidia-imex-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
+    download_apt_with_dep nvidia-fabricmanager-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
+    download_apt_with_dep libnvidia-nscq-${DRIVER_BRANCH} ${DRIVER_VERSION}-1
   fi
 
   ls -al .
@@ -71,12 +74,28 @@ fetch_nvidia_installer () {
   rm $DRIVER_RUN_FILE.run
 }
 
+imex_install() {
+  if [ "$DRIVER_BRANCH" -ge "580" ]; then
+    apt-get install -y --no-install-recommends nvidia-imex=${DRIVER_VERSION}-1
+  elif [ "$DRIVER_BRANCH" -ge "570" ]; then
+    apt-get install -y --no-install-recommends nvidia-imex-${DRIVER_BRANCH}=${DRIVER_VERSION}-1;
+  fi
+}
+
+extra_pkgs_install() {
+  apt-get update
+  imex_install
+  rm -rf /var/lib/apt/lists/*
+}
+
 if [ "$1" = "download_driver_package_deps" ]; then
   download_driver_package_deps
 elif [ "$1" = "build_local_apt_repo" ]; then
   build_local_apt_repo
 elif [ "$1" = "fetch_nvidia_installer" ]; then
   fetch_nvidia_installer
+elif [ "$1" = "extra_pkgs_install" ]; then
+  extra_pkgs_install
 else
   echo "Unknown function: $1"
   exit 1