ubuntu24.04 ci pipeline fix

ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <shivaku@nvidia.com>
NVIDIA · Nov 14, 2024 · c63b6ba · c63b6ba
1 parent 0a86527
commit c63b6ba
Show file tree

Hide file tree

Showing 18 changed files with 270 additions and 40 deletions.
diff --git a/.common-ci.yml b/.common-ci.yml
@@ -73,19 +73,19 @@ trigger-pipeline:
 .driver-versions:
   parallel:
     matrix:
-      - DRIVER_VERSION: [535.216.01, 550.127.05]
+      - DRIVER_VERSION: [535.216.01, 550.127.05, 565.57.01]
 
 # Define the driver versions for jobs that can be run in parallel for ubuntu24.04
 .driver-versions-ubuntu24.04:
   parallel:
     matrix:
-      - DRIVER_VERSION: [535.216.01, 550.127.05]
+      - DRIVER_VERSION: [535.216.01, 550.127.05, 565.57.01]
 
 # Define the matrix of precompiled jobs that can be run in parallel for ubuntu22.04
 .driver-versions-precompiled-ubuntu22.04:
   parallel:
     matrix:
-      - DRIVER_BRANCH: [535, 550]
+      - DRIVER_BRANCH: [535, 550, 565]
         KERNEL_FLAVOR: [aws, azure, generic, nvidia, oracle]
 
 # Define the distribution targets
@@ -312,3 +312,14 @@ release:staging-precompiled-ubuntu22.04:
     - .release:staging-precompiled
   needs:
     - image-precompiled-ubuntu22.04
+
+# Precompiled Ubuntu24.04 release
+release:staging-precompiled-ubuntu24.04:
+  variables:
+    DIST: signed_ubuntu24.04
+    BASE_TARGET: jammy
+  extends:
+    - .driver-versions-precompiled-ubuntu24.04
+    - .release:staging-precompiled
+  needs:
+    - image-precompiled-ubuntu24.04
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -40,7 +40,7 @@ jobs:
         aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
         aws_ssh_key: ${{ secrets.AWS_SSH_KEY }}
-        holodeck_config: "tests/holodeck.yaml"
+        holodeck_config: "tests/holodeck_ubuntu22.04.yaml"
 
     - name: Get public dns name
       id: get_public_dns_name

diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
@@ -21,12 +21,10 @@ on:
       - opened
       - synchronize
     branches:
-      - main
-      - release-*
+      - main-no
   push:
     branches:
-      - main
-      - release-*
+      - main-no
 
 jobs:
   image:
@@ -91,6 +89,7 @@ jobs:
           IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/driver
           VERSION: ${COMMIT_SHORT_SHA}
         run: |
+          echo "DRIVER_VERSIONS=${{ matrix.driver }} make build-${{ matrix.dist }}-${{ matrix.driver }}"
           DRIVER_VERSIONS=${{ matrix.driver }} make build-${{ matrix.dist }}-${{ matrix.driver }}
 
   pre-compiled:
@@ -156,6 +155,7 @@ jobs:
           VERSION: ${COMMIT_SHORT_SHA}
           BASE_TARGET: jammy
         run: |
+          echo "make DRIVER_BRANCH=${{ matrix.driver }} KERNEL_FLAVOR=${{ matrix.flavor }} build-base-${BASE_TARGET}"
           make DRIVER_BRANCH=${{ matrix.driver }} KERNEL_FLAVOR=${{ matrix.flavor }} build-base-${BASE_TARGET}
 
           trap "docker rm -f base-${BASE_TARGET}-${{ matrix.flavor }}" EXIT
@@ -170,7 +170,9 @@ jobs:
           IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/driver
           VERSION: ${COMMIT_SHORT_SHA}
           PRECOMPILED: "true"
+          # SHIVA -- add here ubuntu24.04
           DIST: signed_ubuntu22.04
         run: |
-          source kernel_version.txt && \
+          source kernel_version.txt
+          echo "make DRIVER_VERSIONS=${DRIVER_VERSIONS} DRIVER_BRANCH=${{ matrix.driver }} build-${DIST}-${DRIVER_VERSION}"
           make DRIVER_VERSIONS=${DRIVER_VERSIONS} DRIVER_BRANCH=${{ matrix.driver }} build-${DIST}-${DRIVER_VERSION}
diff --git a/.github/workflows/precompiled.yaml b/.github/workflows/precompiled.yaml
@@ -15,9 +15,20 @@
 # Run this workflow on a schedule
 name: Precompiled images
 
+# on:
+#   schedule:
+#     - cron: '00 09 * * *' # scheduled job
+
 on:
-  schedule:
-    - cron: '00 09 * * *'
+  pull_request:
+    types:
+      - opened
+      - synchronize
+    branches:
+      - ci-precompile-ubuntu24.04
+  push:
+    branches:
+      - ci-precompile-ubuntu24.04
 
 jobs:
   set-driver-version-matrix:
@@ -33,17 +44,25 @@ jobs:
         id: extract_driver_branch
         run: |
           # get driver_branch
-          DRIVER_BRANCH=("535" "550")
+          # DRIVER_BRANCH=("535" "550" "565")
+          # DRIVER_BRANCH=("535" "550")
+          DRIVER_BRANCH=("550")
+          # DRIVER_BRANCH=("565")
           driver_branch_json=$(printf '%s\n' "${DRIVER_BRANCH[@]}" | jq -R . | jq -cs .)
           echo "driver_branch=$driver_branch_json" >> $GITHUB_OUTPUT
 
           # get kernel flavors
-          KERNEL_FLAVORS=("aws" "azure" "generic" "nvidia" "oracle")
+          # KERNEL_FLAVORS=("aws" "azure" "generic" "nvidia" "oracle")
+          # KERNEL_FLAVORS=("azure" "generic" "nvidia" "oracle")
+          # KERNEL_FLAVORS=("aws")
+          KERNEL_FLAVORS=("generic")
           kernel_flavors_json=$(printf '%s\n' "${KERNEL_FLAVORS[@]}" | jq -R . | jq -cs .)
           echo "kernel_flavors=$kernel_flavors_json" >> $GITHUB_OUTPUT
 
           # get ubuntu distributions
-          DIST=("ubuntu22.04")
+          # DIST=("ubuntu22.04" "ubuntu24.04")
+          # DIST=("ubuntu22.04")
+          DIST=("ubuntu24.04")
           dist_json=$(printf '%s\n' "${DIST[@]}" | jq -R . | jq -cs .)
           echo "dist=$dist_json" >> $GITHUB_OUTPUT
 
@@ -201,7 +220,7 @@ jobs:
           aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws_ssh_key: ${{ secrets.AWS_SSH_KEY }}
-          holodeck_config: "tests/holodeck.yaml"
+          holodeck_config: "tests/holodeck_${{ matrix.dist }}.yaml"
 
       - name: Get public dns name
         id: get_public_dns_name
@@ -296,7 +315,7 @@ jobs:
       matrix:
         driver_branch: ${{ fromJson(needs.set-driver-version-matrix.outputs.driver_branch) }}
         kernel_version: ${{ fromJson(needs.determine-e2e-test-matrix.outputs.matrix_values) }}
-        dist: ${{ fromJson(needs.set-driver-version-matrix.outputs.dist) }}     
+        dist: ${{ fromJson(needs.set-driver-version-matrix.outputs.dist) }}
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -120,3 +120,12 @@ image-precompiled-ubuntu22.04:
   extends:
     - .driver-versions-precompiled-ubuntu22.04
     - .image-build-precompiled
+
+image-precompiled-ubuntu24.04:
+  variables:
+    DIST: signed_ubuntu24.04
+    BASE_TARGET: jammy
+    CVE_UPDATES: "curl libc6"
+  extends:
+    - .driver-versions-precompiled-ubuntu24.04
+    - .image-build-precompiled
diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml
@@ -77,6 +77,30 @@ variables:
     - !reference [.image-pull-rules, rules]
 
 
+.image-pull-ubuntu24.04:
+  # Perform for each DRIVER_VERSION
+  extends:
+    - .driver-versions
+    - .image-pull-generic
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: never
+    - !reference [.image-pull-rules, rules]
+
+image-precompiled-ubuntu24.04:
+  variables:
+    DIST: signed_ubuntu24.04
+    BASE_TARGET: jammy
+    PRECOMPILED: "true"
+    CVE_UPDATES: "curl libc6"
+  rules:
+    - when: delayed
+      start_in: 30 minutes
+  extends:
+    - .driver-versions-precompiled-ubuntu24.04
+    - .image-pull-generic
+
+
 .image-pull-ubuntu22.04:
   # Perform for each DRIVER_VERSION
   extends:
@@ -196,6 +220,18 @@ image-rhel8:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event"
     - !reference [.pipeline-trigger-rules, rules]
 
+.scan-precompiled-ubuntu24.04:
+  variables:
+    DIST: signed_ubuntu24.04
+    BASE_TARGET: jammy
+    PRECOMPILED: "true"
+  extends:
+    - .driver-versions-precompiled-ubuntu24.04
+    - .scan-generic
+  rules:
+    - !reference [.scan-rules-common, rules]
+    - when: always
+
 .scan-precompiled-ubuntu22.04:
   variables:
     DIST: signed_ubuntu22.04
@@ -312,6 +348,19 @@ release:ngc-ubuntu24.04:
     - .dist-ubuntu24.04
     - .driver-versions-ubuntu24.04
 
+release:ngc-precompiled-ubuntu24.04:
+  variables:
+    DIST: signed_ubuntu24.04
+    BASE_TARGET: jammy
+    PRECOMPILED: "true"
+  extends:
+    - .driver-versions-precompiled-ubuntu24.04
+    - .release-generic
+    - .release:ngc-variables
+  rules:
+    # Only run NGC release job on scheduled pipelines
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+
 release:ngc-precompiled-ubuntu22.04:
   variables:
     DIST: signed_ubuntu22.04
@@ -439,6 +488,23 @@ release:ngc-rhel8.10:
     - 'echo "Signing the image ${IMAGE_NAME}:${IMAGE_TAG}"'
     - ngc-cli/ngc registry image publish --source ${IMAGE_NAME}:${IMAGE_TAG} ${IMAGE_NAME}:${IMAGE_TAG} --public --discoverable --allow-guest --sign --org nvidia
 
+sign:ngc-precompiled-ubuntu24.04:
+  extends:
+    - .driver-versions-precompiled-ubuntu24.04
+    - .dist-ubuntu22.04
+    - .release-generic
+    - .release:ngc-variables
+    - .sign:ngc
+  variables:
+    DIST: signed_ubuntu24.04
+    BASE_TARGET: jammy
+    PRECOMPILED: "true"
+  needs:
+    - release:ngc-precompiled-ubuntu24.04
+  rules:
+    # Only run NGC release job on scheduled pipelines
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+
 sign:ngc-precompiled-ubuntu22.04:
   extends:
     - .driver-versions-precompiled-ubuntu22.04
@@ -463,6 +529,7 @@ sign:ngc-ubuntu-rhel-rhcos:
     matrix:
     - SIGN_JOB_NAME: ["ubuntu"]
       VERSION: ["24.04"]
+      DRIVER_VERSION: ["535.216.01", "550.127.05", "565.57.01"]
     - SIGN_JOB_NAME: ["ubuntu"]
       VERSION: ["22.04"]
       DRIVER_VERSION: ["535.216.01", "550.127.05", "565.57.01"]

diff --git a/Makefile b/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 ubuntu24.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_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))

diff --git a/base/generate-ci-config b/base/generate-ci-config
@@ -24,6 +24,9 @@ DRIVER_VERSION=$(apt-cache show nvidia-utils-${DRIVER_BRANCH}-server |grep Versi
 # Latest supported kernel
 SK=$(echo $SUPPORTED_KERNELS | awk '{print $NF}')
 
+# SHIVA
+#SK=$(echo $SUPPORTED_KERNELS | awk '{print $(NF-1)}')
+
 # Write to file
 echo "export KERNEL_VERSION=$SK DRIVER_VERSION=$DRIVER_VERSION DRIVER_VERSIONS=$DRIVER_VERSION" > /var/kernel_version.txt
 echo "KERNEL_VERSION=$SK DRIVER_VERSION=$DRIVER_VERSION DRIVER_VERSIONS=$DRIVER_VERSION"
diff --git a/tests/cases/nvidia-driver.sh b/tests/cases/nvidia-driver.sh
@@ -8,9 +8,12 @@ fi
 
 # export gpu-operator options
 export TEST_CASE_ARGS="$1"
+echo "uploading image SHIVA $2"
 if [[ $# -eq 2 ]]; then
 	export IMAGE_PATH="$2"
+	echo "uploading image SHIVA 1"
 	sudo ctr -n k8s.io images import "$IMAGE_PATH"
+	echo "uploading image SHIVA 2"
 fi
 
 SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../scripts && pwd )"

diff --git a/tests/holodeck.yaml → tests/holodeck_ubuntu22.04.yaml b/tests/holodeck.yaml → tests/holodeck_ubuntu22.04.yaml
diff --git a/tests/holodeck_ubuntu24.04.yaml b/tests/holodeck_ubuntu24.04.yaml
@@ -0,0 +1,32 @@
+apiVersion: holodeck.nvidia.com/v1alpha1
+kind: Environment
+metadata:
+  name: HOLODECK_NAME
+  description: "end-to-end test infrastructure"
+spec:
+  provider: aws
+  auth:
+    keyName: cnt-ci
+    privateKey: HOLODECK_PRIVATE_KEY
+  instance:
+    type: g4dn.xlarge
+    region: us-west-1
+    ingressIpRanges:
+    - 18.190.12.32/32
+    - 3.143.46.93/32
+    - 52.15.119.136/32
+    - 35.155.108.162/32
+    - 35.162.190.51/32
+    - 54.201.61.24/32
+    image:
+      architecture: amd64
+      imageId: ami-0da424eb883458071
+  containerRuntime:
+    install: true
+    name: containerd
+    version: 1.7.22
+  kubernetes:
+    install: true
+    installer: kubeadm
+    version: v1.30.0
+    crictlVersion: v1.30.0
diff --git a/tests/scripts/.definitions.sh b/tests/scripts/.definitions.sh
@@ -16,8 +16,8 @@ CASES_DIR="$( cd "${TEST_DIR}/cases" && pwd )"
 
 : ${HELM_NVIDIA_REPO:="https://helm.ngc.nvidia.com/nvidia"}
 
-: ${DAEMON_POD_STATUS_TIME_OUT:="15m"}
-: ${POD_STATUS_TIME_OUT:="2m"}
+: ${DAEMON_POD_STATUS_TIME_OUT:="120m"}
+: ${POD_STATUS_TIME_OUT:="120m"}
 
 : ${LOG_DIR:="/tmp/logs"}
 

diff --git a/tests/scripts/checks.sh b/tests/scripts/checks.sh
@@ -15,6 +15,19 @@ check_pod_ready() {
 	else
 		# print status of pod
 		kubectl get pods -n ${TEST_NAMESPACE}
+		echo "SHIVA AAAAAAAAA CHECK"
+		# sudo ctr -n k8s.io images ls
+		echo "SHIVA AAAAAAAAA CHECK============="
+		kubectl describe pod $(kubectl get pods -n ${TEST_NAMESPACE} --no-headers | grep "nvidia-driver-daemonset" | awk '{print $1}')  -n ${TEST_NAMESPACE}
+		echo "SHIVA AAAAAAAAA CHECK@@@@@@@@@@@@@"
+		kubectl get pods -n ${TEST_NAMESPACE} --no-headers
+		echo "SHIVA AAAAAAAAA CHECK@@@@@@@@@@@@@"
+		kubectl get pods -n ${TEST_NAMESPACE} --no-headers | grep "nvidia-driver-daemonset"
+		echo "SHIVA AAAAAAAAA CHECK@@@@@@@@@@@@@"
+		kubectl get pods -n ${TEST_NAMESPACE} --no-headers | grep "nvidia-driver-daemonset" | awk '{print $1}'
+		echo "SHIVA AAAAAAAAA CHECK@@@@@@@@@@@@@"
+		kubectl logs $(kubectl get pods -n ${TEST_NAMESPACE} --no-headers | grep "nvidia-driver-daemonset" | awk '{print $1}') -n ${TEST_NAMESPACE}
+		echo "SHIVA AAAAAAAAA CHECK============="
 	fi
 
 	return 1

diff --git a/tests/scripts/ci-precompiled-helpers.sh b/tests/scripts/ci-precompiled-helpers.sh
@@ -1,6 +1,6 @@
 get_kernel_versions_to_test() {
     if [[ "$#" -ne 4 ]]; then
-	    echo " Error:$0 must be called with BASE_TARGET DRIVER_BRANCHES DRIVER_BRANCHES DIST" >&2
+	    echo " Error:$0 must be called with BASE_TARGET KERNEL_FLAVORS DRIVER_BRANCHES DIST" >&2
 	    exit 1
     fi