add ubuntu24.04 driver container

Signed-off-by: Tariq Ibrahim <[email protected]>

Author: tariq1890

.common-ci.yml

@@ -75,11 +75,11 @@ trigger-pipeline:
     matrix:
       - DRIVER_VERSION: [535.183.06, 550.90.12, 560.35.03]
 
-# Define the driver versions for jobs that can be run in parallel for ubuntu22.04
-.driver-versions-ubuntu22.04:
+# Define the driver versions for jobs that can be run in parallel for ubuntu24.04
+.driver-versions-ubuntu24.04:
   parallel:
     matrix:
-      - DRIVER_VERSION: [535.183.06, 550.90.12, 560.35.03]
+      - DRIVER_VERSION: [550.90.12, 560.35.03]
 
 # Define the matrix of precompiled jobs that can be run in parallel for ubuntu22.04
 .driver-versions-precompiled-ubuntu22.04:
@@ -88,12 +88,6 @@ trigger-pipeline:
       - DRIVER_BRANCH: [535, 550]
         KERNEL_FLAVOR: [aws, azure, generic, nvidia, oracle]
 
-# Define the driver versions for jobs that can be run in parallel for rhel9
-.driver-versions-rhel9:
-  parallel:
-    matrix:
-      - DRIVER_VERSION: [535.183.06, 550.90.12, 560.35.03]
-
 # Define the distribution targets
 .dist-ubuntu20.04:
   variables:
@@ -105,6 +99,10 @@ trigger-pipeline:
     DIST: ubuntu22.04
     CVE_UPDATES: "openssl"
 
+.dist-ubuntu24.04:
+  variables:
+    DIST: ubuntu24.04
+
 .dist-rhel8:
   variables:
     DIST: rhel8
@@ -170,15 +168,23 @@ trigger-pipeline:
   # Perform for each DRIVER_VERSION
   extends:
     - .release-generic
-    - .driver-versions-ubuntu22.04
+    - .driver-versions
+  rules:
+    - if: $CI_PIPELINE_SOURCE != "schedule"
+
+.release-ubuntu24.04:
+  # Perform for each DRIVER_VERSION
+  extends:
+    - .release-generic
+    - .driver-versions-ubuntu24.04
   rules:
     - if: $CI_PIPELINE_SOURCE != "schedule"
 
 .release-rhel9:
   # Perform for each DRIVER_VERSION
   extends:
     - .release-generic
-    - .driver-versions-rhel9
+    - .driver-versions
   rules:
     - if: $CI_PIPELINE_SOURCE != "schedule"
 
@@ -211,6 +217,15 @@ trigger-pipeline:
     OUT_REGISTRY: "${CI_REGISTRY}"
     OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/driver"
 
+.release:staging-ubuntu24.04:
+  extends:
+    - .release-ubuntu24.04
+  variables:
+    OUT_REGISTRY_USER: "${CI_REGISTRY_USER}"
+    OUT_REGISTRY_TOKEN: "${CI_REGISTRY_PASSWORD}"
+    OUT_REGISTRY: "${CI_REGISTRY}"
+    OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/driver"
+
 .release:staging-rhel9:
   extends:
     - .release-rhel9

.github/workflows/image.yaml

@@ -40,6 +40,7 @@ jobs:
         dist:
           - ubuntu20.04
           - ubuntu22.04
+          - ubuntu24.04
           - rhel8
           - rhel9
         ispr:
@@ -53,6 +54,8 @@ jobs:
           - ispr: true
             dist: ubuntu20.04
             driver: 550.90.12
+          - dist: ubuntu24.04
+            driver: 535.183.06
       fail-fast: false
     steps:
       - uses: actions/checkout@v4

.gitlab-ci.yml

@@ -44,7 +44,16 @@ include:
 .image-build-ubuntu22.04:
   # Perform for each DRIVER_VERSION
   extends:
-    - .driver-versions-ubuntu22.04
+    - .driver-versions
+    - .image-build-generic
+  rules:
+    - if: $CI_PIPELINE_SOURCE != "schedule"
+
+# Define the image build targets
+.image-build-ubuntu24.04:
+  # Perform for each DRIVER_VERSION
+  extends:
+    - .driver-versions-ubuntu24.04
     - .image-build-generic
   rules:
     - if: $CI_PIPELINE_SOURCE != "schedule"
@@ -53,7 +62,7 @@ include:
 .image-build-rhel9:
   # Perform for each DRIVER_VERSION
   extends:
-    - .driver-versions-rhel9
+    - .driver-versions
     - .image-build-generic
   rules:
     - if: $CI_PIPELINE_SOURCE != "schedule"
@@ -69,6 +78,11 @@ image-ubuntu22.04:
     - .image-build-ubuntu22.04
     - .dist-ubuntu22.04
 
+image-ubuntu24.04:
+  extends:
+    - .image-build-ubuntu24.04
+    - .dist-ubuntu24.04
+
 image-rhel8:
   extends:
     - .image-build

.nvidia-ci.yml

@@ -80,7 +80,7 @@ variables:
 .image-pull-ubuntu22.04:
   # Perform for each DRIVER_VERSION
   extends:
-    - .driver-versions-ubuntu22.04
+    - .driver-versions
     - .image-pull-generic
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
@@ -119,7 +119,7 @@ image-rhel9:
   extends:
     - .image-pull
     - .dist-rhel9
-    - .driver-versions-rhel9
+    - .driver-versions
 
 # The .scan step forms the base of the image scan operation performed before releasing
 # images.
@@ -181,7 +181,19 @@ image-rhel9:
 .scan-ubuntu22.04:
   # Repeat for each DRIVER_VERSION
   extends:
-    - .driver-versions-ubuntu22.04
+    - .driver-versions
+    - .scan-generic
+  rules:
+    - !reference [.scan-rules-common, rules]
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: never
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - !reference [.pipeline-trigger-rules, rules]
+
+.scan-ubuntu24.04:
+  # Repeat for each DRIVER_VERSION
+  extends:
+    - .driver-versions-ubuntu24.04
     - .scan-generic
   rules:
     - !reference [.scan-rules-common, rules]
@@ -235,6 +247,22 @@ scan-ubuntu22.04-arm64:
   needs:
     - image-ubuntu22.04
 
+scan-ubuntu24.04-amd64:
+  extends:
+    - .scan-ubuntu24.04
+    - .dist-ubuntu24.04
+    - .platform-amd64
+  needs:
+    - image-ubuntu24.04
+
+scan-ubuntu24.04-arm64:
+  extends:
+    - .scan-ubuntu24.04
+    - .dist-ubuntu24.04
+    - .platform-arm64
+  needs:
+    - image-ubuntu24.04
+
 scan-precompiled-ubuntu22.04-amd64:
   variables:
     PLATFORM: linux/amd64
@@ -265,7 +293,7 @@ scan-rhel9-amd64:
     - .scan
     - .dist-rhel9
     - .platform-amd64
-    - .driver-versions-rhel9
+    - .driver-versions
   needs:
     - image-rhel9
 
@@ -274,7 +302,7 @@ scan-rhel9-arm64:
     - .scan
     - .dist-rhel9
     - .platform-arm64
-    - .driver-versions-rhel9
+    - .driver-versions
   needs:
     - image-rhel9
 
@@ -300,7 +328,13 @@ release:ngc-ubuntu22.04:
   extends:
     - .release:ngc
     - .dist-ubuntu22.04
-    - .driver-versions-ubuntu22.04
+    - .driver-versions
+
+release:ngc-ubuntu24.04:
+  extends:
+    - .release:ngc
+    - .dist-ubuntu24.04
+    - .driver-versions-ubuntu24.04
 
 release:ngc-precompiled-ubuntu22.04:
   variables:
@@ -478,6 +512,9 @@ sign:ngc-ubuntu-rhel-rhcos:
     - SIGN_JOB_NAME: ["ubuntu"]
       VERSION: ["20.04"]
       DRIVER_VERSION: ["535.183.06", "550.90.12", "560.35.03"]
+    - SIGN_JOB_NAME: ["ubuntu"]
+      VERSION: ["24.04"]
+      DRIVER_VERSION: ["550.90.12", "560.35.03"]
     - SIGN_JOB_NAME: ["rhel"]
       VERSION: ["8.8", "8.10"]
       DRIVER_VERSION: ["535.183.06", "550.90.12", "560.35.03"]

Makefile

@@ -54,7 +54,7 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(OUT_DIST)
 OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
 
 ##### Public rules #####
-DISTRIBUTIONS := ubuntu18.04 ubuntu20.04 ubuntu22.04 signed_ubuntu20.04 signed_ubuntu22.04 rhel8 rhel9 flatcar fedora36 sles15.3 precompiled_rhcos
+DISTRIBUTIONS := ubuntu18.04 ubuntu20.04 ubuntu22.04 ubuntu24.04 signed_ubuntu20.04 signed_ubuntu22.04 rhel8 rhel9 flatcar fedora36 sles15.3 precompiled_rhcos
 PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))
 BASE_FROM := jammy focal
 PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))
@@ -92,6 +92,10 @@ pull-signed_ubuntu22.04%: DIST = ubuntu22.04
 pull-signed_ubuntu22.04%: DRIVER_TAG = $(DRIVER_BRANCH)
 pull-signed_ubuntu22.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
 
+pull-signed_ubuntu24.04%: DIST = ubuntu24.04
+pull-signed_ubuntu24.04%: DRIVER_TAG = $(DRIVER_BRANCH)
+pull-signed_ubuntu24.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
+
 PLATFORM ?= linux/amd64
 $(DRIVER_PULL_TARGETS): pull-%:
 	$(DOCKER) pull "--platform=$(PLATFORM)" "$(IMAGE)"
@@ -109,6 +113,10 @@ archive-signed_ubuntu22.04%: DIST = ubuntu22.04
 archive-signed_ubuntu22.04%: DRIVER_TAG = $(DRIVER_BRANCH)
 archive-signed_ubuntu22.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
 
+archive-signed_ubuntu24.04%: DIST = ubuntu24.04
+archive-signed_ubuntu24.04%: DRIVER_TAG = $(DRIVER_BRANCH)
+archive-signed_ubuntu24.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
+
 $(DRIVER_ARCHIVE_TARGETS): archive-%:
 	$(DOCKER) save "$(IMAGE)" -o "archive.tar"
 
@@ -130,6 +138,11 @@ push-signed_ubuntu22.04%: DRIVER_TAG = $(DRIVER_BRANCH)
 push-signed_ubuntu22.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
 push-signed_ubuntu22.04%: OUT_IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
 
+push-signed_ubuntu24.04%: DIST = ubuntu24.04
+push-signed_ubuntu24.04%: DRIVER_TAG = $(DRIVER_BRANCH)
+push-signed_ubuntu24.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
+push-signed_ubuntu24.04%: OUT_IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
+
 # $(DRIVER_BUILD_TARGETS) is in the form of build-$(DIST)-$(DRIVER_VERSION)
 # Parse the target to set the required variables.
 build-%: DIST = $(word 2,$(subst -, ,$@))
@@ -176,6 +189,13 @@ build-signed_ubuntu22.04%: DRIVER_TAG = $(DRIVER_BRANCH)
 build-signed_ubuntu22.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
 build-signed_ubuntu22.04%: DOCKER_BUILD_ARGS =  --build-arg KERNEL_VERSION="$(KERNEL_VERSION)"
 
+# ubuntu24.04 Precompiled Driver
+build-signed_ubuntu24.04%: DIST = ubuntu24.04
+build-signed_ubuntu24.04%: SUBDIR = ubuntu24.04/precompiled
+build-signed_ubuntu24.04%: DRIVER_TAG = $(DRIVER_BRANCH)
+build-signed_ubuntu24.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
+build-signed_ubuntu24.04%: DOCKER_BUILD_ARGS =  --build-arg KERNEL_VERSION="$(KERNEL_VERSION)"
+
 # base is an image used to poll Canonical for the latest kernel version
 build-base-%: DOCKERFILE = $(CURDIR)/base/Dockerfile
 build-base-%: TARGET = $(word 3,$(subst -, ,$@))

multi-arch.mk

@@ -27,4 +27,5 @@ $(DRIVER_PUSH_TARGETS): push-%:
 build-ubuntu18.04%: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
 build-signed_ubuntu20.04%: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
 build-signed_ubuntu22.04%: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
+build-signed_ubuntu24.04%: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
 build-sles%: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64