From a81821bd56f20b2282967bf9c53a4a0c2efa0243 Mon Sep 17 00:00:00 2001
From: Rahul Sharma <rahulsharm@nvidia.com>
Date: Tue, 24 Mar 2026 08:41:34 -0700
Subject: [PATCH 1/2] add containerized driver builds for 595TRD1 driver

Signed-off-by: Rahul Sharma <rahulsharm@nvidia.com>
---
 .common-ci.yml               | 8 ++++----
 .github/workflows/image.yaml | 1 +
 .nvidia-ci.yml               | 2 +-
 versions.mk                  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.common-ci.yml b/.common-ci.yml
index 2a380ecfd..3ba3c7381 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -19,7 +19,7 @@ default:
       command: ["--experimental"]
 
 variables:
-  DRIVER_VERSIONS: 535.288.01 580.126.20
+  DRIVER_VERSIONS: 535.288.01 580.126.20 595.58.03
   BUILD_MULTI_ARCH_IMAGES: "true"
 
 stages:
@@ -81,18 +81,18 @@ trigger-pipeline:
 .driver-versions:
   parallel:
     matrix:
-      - DRIVER_VERSION: [535.288.01, 580.126.20]
+      - DRIVER_VERSION: [535.288.01, 580.126.20, 595.58.03]
 
 # Define the driver versions for jobs that can be run in parallel
 .driver-versions-ubuntu24.04:
   parallel:
     matrix:
-      - DRIVER_VERSION: [580.126.20]
+      - DRIVER_VERSION: [580.126.20, 595.58.03]
 
 .driver-versions-rhel10:
   parallel:
     matrix:
-      - DRIVER_VERSION: [580.126.20]
+      - DRIVER_VERSION: [580.126.20, 595.58.03]
 
 # Define the matrix of precompiled jobs that can be run in parallel for ubuntu22.04
 .driver-versions-precompiled-ubuntu22.04:
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index dfffc5352..3bb05a9ab 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -30,6 +30,7 @@ jobs:
         driver:
           - 535.288.01
           - 580.126.20
+          - 595.58.03
         dist:
           - ubuntu22.04
           - ubuntu24.04
diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml
index 5414aaeb5..24f652f02 100644
--- a/.nvidia-ci.yml
+++ b/.nvidia-ci.yml
@@ -34,7 +34,7 @@ variables:
   # Define the public staging registry
   STAGING_REGISTRY: ghcr.io/nvidia
   STAGING_VERSION: "${CI_COMMIT_SHORT_SHA}"
-  PUBLISH_VERSIONS: 580.126.20
+  PUBLISH_VERSIONS: 595.58.03
 
 .image-pull-rules:
   # We delay the job start to allow the public pipeline to generate the required images.
diff --git a/versions.mk b/versions.mk
index c8491772a..d304cfd66 100644
--- a/versions.mk
+++ b/versions.mk
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 # DRIVER_VERSIONS contains latest version in all active datacenter branches
-DRIVER_VERSIONS ?= 535.288.01 580.126.20
+DRIVER_VERSIONS ?= 535.288.01 580.126.20 595.58.03
 
 GOLANG_VERSION := 1.25.7

From 90201774fc0c79e87e841e8e2a7109b632a34cee Mon Sep 17 00:00:00 2001
From: Rahul Sharma <rahulsharm@nvidia.com>
Date: Tue, 24 Mar 2026 20:27:52 -0700
Subject: [PATCH 2/2] add CVE_UPDATES to pick patches if available

Signed-off-by: Rahul Sharma <rahulsharm@nvidia.com>
---
 .github/actions/set-cve-updates/action.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/set-cve-updates/action.yml b/.github/actions/set-cve-updates/action.yml
index ec75d2c6b..2549b7352 100644
--- a/.github/actions/set-cve-updates/action.yml
+++ b/.github/actions/set-cve-updates/action.yml
@@ -29,7 +29,7 @@ runs:
       shell: bash
       run: |
         if [[ "${{ inputs.dist }}" =~ ^(rhel|rocky) ]]; then
-          echo "CVE_UPDATES=openssl python3-urllib3 libarchive libxml2 pam python3 sqlite-libs gnupg2" >> $GITHUB_ENV
+          echo "CVE_UPDATES=openssl python3-urllib3 libarchive libxml2 pam python3 platform-python python3-libs curl p11-kit lz4-libs vim-minimal sqlite-libs gnupg2 gnutls glib2 libblkid libfdisk libmount libsmartcols libuuid util-linux util-linux-core openldap" >> $GITHUB_ENV
         elif [[ "${{ inputs.dist }}" =~ ^ubuntu ]]; then
-          echo "CVE_UPDATES=gnupg2" >> $GITHUB_ENV
+          echo "CVE_UPDATES=gnupg2 libgnutls30" >> $GITHUB_ENV
         fi