Skip to content

Commit c3f66b3

Browse files
shivakunvshivakunv
committed
ubuntu24.04 ci pipeline fix
ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]> ubuntu24.04 ci pipeline fix ubuntu24.04 ci pipeline fix ubuntu24.04 ci pipeline fix Signed-off-by: shiva kumar <[email protected]>
1 parent 0a86527 commit c3f66b3

20 files changed

+284
-43
lines changed

‎.common-ci.yml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,19 @@ trigger-pipeline:
7373
.driver-versions:
7474
parallel:
7575
matrix:
76-
- DRIVER_VERSION: [535.216.01, 550.127.05]
76+
- DRIVER_VERSION: [535.216.01, 550.127.05, 565.57.01]
7777

7878
# Define the driver versions for jobs that can be run in parallel for ubuntu24.04
7979
.driver-versions-ubuntu24.04:
8080
parallel:
8181
matrix:
82-
- DRIVER_VERSION: [535.216.01, 550.127.05]
82+
- DRIVER_VERSION: [535.216.01, 550.127.05, 565.57.01]
8383

8484
# Define the matrix of precompiled jobs that can be run in parallel for ubuntu22.04
8585
.driver-versions-precompiled-ubuntu22.04:
8686
parallel:
8787
matrix:
88-
- DRIVER_BRANCH: [535, 550]
88+
- DRIVER_BRANCH: [535, 550, 565]
8989
KERNEL_FLAVOR: [aws, azure, generic, nvidia, oracle]
9090

9191
# Define the distribution targets
@@ -312,3 +312,14 @@ release:staging-precompiled-ubuntu22.04:
312312
- .release:staging-precompiled
313313
needs:
314314
- image-precompiled-ubuntu22.04
315+
316+
# Precompiled Ubuntu24.04 release
317+
release:staging-precompiled-ubuntu24.04:
318+
variables:
319+
DIST: signed_ubuntu24.04
320+
BASE_TARGET: jammy
321+
extends:
322+
- .driver-versions-precompiled-ubuntu24.04
323+
- .release:staging-precompiled
324+
needs:
325+
- image-precompiled-ubuntu24.04

‎.github/workflows/ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
4141
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
4242
aws_ssh_key: ${{ secrets.AWS_SSH_KEY }}
43-
holodeck_config: "tests/holodeck.yaml"
43+
holodeck_config: "tests/holodeck_ubuntu22.04.yaml"
4444

4545
- name: Get public dns name
4646
id: get_public_dns_name

‎.github/workflows/image.yaml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@ on:
2121
- opened
2222
- synchronize
2323
branches:
24-
- main
25-
- release-*
24+
- main-no
2625
push:
2726
branches:
28-
- main
29-
- release-*
27+
- main-no
3028

3129
jobs:
3230
image:
@@ -91,6 +89,7 @@ jobs:
9189
IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/driver
9290
VERSION: ${COMMIT_SHORT_SHA}
9391
run: |
92+
echo "DRIVER_VERSIONS=${{ matrix.driver }} make build-${{ matrix.dist }}-${{ matrix.driver }}"
9493
DRIVER_VERSIONS=${{ matrix.driver }} make build-${{ matrix.dist }}-${{ matrix.driver }}
9594
9695
pre-compiled:
@@ -156,6 +155,7 @@ jobs:
156155
VERSION: ${COMMIT_SHORT_SHA}
157156
BASE_TARGET: jammy
158157
run: |
158+
echo "make DRIVER_BRANCH=${{ matrix.driver }} KERNEL_FLAVOR=${{ matrix.flavor }} build-base-${BASE_TARGET}"
159159
make DRIVER_BRANCH=${{ matrix.driver }} KERNEL_FLAVOR=${{ matrix.flavor }} build-base-${BASE_TARGET}
160160
161161
trap "docker rm -f base-${BASE_TARGET}-${{ matrix.flavor }}" EXIT
@@ -170,7 +170,9 @@ jobs:
170170
IMAGE_NAME: ghcr.io/${LOWERCASE_REPO_OWNER}/driver
171171
VERSION: ${COMMIT_SHORT_SHA}
172172
PRECOMPILED: "true"
173+
# SHIVA -- add here ubuntu24.04
173174
DIST: signed_ubuntu22.04
174175
run: |
175-
source kernel_version.txt && \
176+
source kernel_version.txt
177+
echo "make DRIVER_VERSIONS=${DRIVER_VERSIONS} DRIVER_BRANCH=${{ matrix.driver }} build-${DIST}-${DRIVER_VERSION}"
176178
make DRIVER_VERSIONS=${DRIVER_VERSIONS} DRIVER_BRANCH=${{ matrix.driver }} build-${DIST}-${DRIVER_VERSION}

‎.github/workflows/precompiled.yaml‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,20 @@
1515
# Run this workflow on a schedule
1616
name: Precompiled images
1717

18+
# on:
19+
# schedule:
20+
# - cron: '00 09 * * *' # scheduled job
21+
1822
on:
19-
schedule:
20-
- cron: '00 09 * * *'
23+
pull_request:
24+
types:
25+
- opened
26+
- synchronize
27+
branches:
28+
- ci-precompile-ubuntu24.04
29+
push:
30+
branches:
31+
- ci-precompile-ubuntu24.04
2132

2233
jobs:
2334
set-driver-version-matrix:
@@ -33,17 +44,25 @@ jobs:
3344
id: extract_driver_branch
3445
run: |
3546
# get driver_branch
36-
DRIVER_BRANCH=("535" "550")
47+
# DRIVER_BRANCH=("535" "550" "565")
48+
# DRIVER_BRANCH=("535" "550")
49+
DRIVER_BRANCH=("550")
50+
# DRIVER_BRANCH=("565")
3751
driver_branch_json=$(printf '%s\n' "${DRIVER_BRANCH[@]}" | jq -R . | jq -cs .)
3852
echo "driver_branch=$driver_branch_json" >> $GITHUB_OUTPUT
3953
4054
# get kernel flavors
41-
KERNEL_FLAVORS=("aws" "azure" "generic" "nvidia" "oracle")
55+
# KERNEL_FLAVORS=("aws" "azure" "generic" "nvidia" "oracle")
56+
# KERNEL_FLAVORS=("azure" "generic" "nvidia" "oracle")
57+
# KERNEL_FLAVORS=("aws")
58+
KERNEL_FLAVORS=("generic")
4259
kernel_flavors_json=$(printf '%s\n' "${KERNEL_FLAVORS[@]}" | jq -R . | jq -cs .)
4360
echo "kernel_flavors=$kernel_flavors_json" >> $GITHUB_OUTPUT
4461
4562
# get ubuntu distributions
46-
DIST=("ubuntu22.04")
63+
# DIST=("ubuntu22.04" "ubuntu24.04")
64+
# DIST=("ubuntu22.04")
65+
DIST=("ubuntu24.04")
4766
dist_json=$(printf '%s\n' "${DIST[@]}" | jq -R . | jq -cs .)
4867
echo "dist=$dist_json" >> $GITHUB_OUTPUT
4968
@@ -201,7 +220,7 @@ jobs:
201220
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
202221
aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
203222
aws_ssh_key: ${{ secrets.AWS_SSH_KEY }}
204-
holodeck_config: "tests/holodeck.yaml"
223+
holodeck_config: "tests/holodeck_${{ matrix.dist }}.yaml"
205224

206225
- name: Get public dns name
207226
id: get_public_dns_name
@@ -296,7 +315,7 @@ jobs:
296315
matrix:
297316
driver_branch: ${{ fromJson(needs.set-driver-version-matrix.outputs.driver_branch) }}
298317
kernel_version: ${{ fromJson(needs.determine-e2e-test-matrix.outputs.matrix_values) }}
299-
dist: ${{ fromJson(needs.set-driver-version-matrix.outputs.dist) }}
318+
dist: ${{ fromJson(needs.set-driver-version-matrix.outputs.dist) }}
300319
steps:
301320
- name: Check out code
302321
uses: actions/checkout@v4

‎.gitlab-ci.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,12 @@ image-precompiled-ubuntu22.04:
120120
extends:
121121
- .driver-versions-precompiled-ubuntu22.04
122122
- .image-build-precompiled
123+
124+
image-precompiled-ubuntu24.04:
125+
variables:
126+
DIST: signed_ubuntu24.04
127+
BASE_TARGET: jammy
128+
CVE_UPDATES: "curl libc6"
129+
extends:
130+
- .driver-versions-precompiled-ubuntu24.04
131+
- .image-build-precompiled

‎.nvidia-ci.yml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,30 @@ variables:
7777
- !reference [.image-pull-rules, rules]
7878

7979

80+
.image-pull-ubuntu24.04:
81+
# Perform for each DRIVER_VERSION
82+
extends:
83+
- .driver-versions
84+
- .image-pull-generic
85+
rules:
86+
- if: $CI_PIPELINE_SOURCE == "schedule"
87+
when: never
88+
- !reference [.image-pull-rules, rules]
89+
90+
image-precompiled-ubuntu24.04:
91+
variables:
92+
DIST: signed_ubuntu24.04
93+
BASE_TARGET: jammy
94+
PRECOMPILED: "true"
95+
CVE_UPDATES: "curl libc6"
96+
rules:
97+
- when: delayed
98+
start_in: 30 minutes
99+
extends:
100+
- .driver-versions-precompiled-ubuntu24.04
101+
- .image-pull-generic
102+
103+
80104
.image-pull-ubuntu22.04:
81105
# Perform for each DRIVER_VERSION
82106
extends:
@@ -196,6 +220,18 @@ image-rhel8:
196220
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
197221
- !reference [.pipeline-trigger-rules, rules]
198222

223+
.scan-precompiled-ubuntu24.04:
224+
variables:
225+
DIST: signed_ubuntu24.04
226+
BASE_TARGET: jammy
227+
PRECOMPILED: "true"
228+
extends:
229+
- .driver-versions-precompiled-ubuntu24.04
230+
- .scan-generic
231+
rules:
232+
- !reference [.scan-rules-common, rules]
233+
- when: always
234+
199235
.scan-precompiled-ubuntu22.04:
200236
variables:
201237
DIST: signed_ubuntu22.04
@@ -312,6 +348,19 @@ release:ngc-ubuntu24.04:
312348
- .dist-ubuntu24.04
313349
- .driver-versions-ubuntu24.04
314350

351+
release:ngc-precompiled-ubuntu24.04:
352+
variables:
353+
DIST: signed_ubuntu24.04
354+
BASE_TARGET: jammy
355+
PRECOMPILED: "true"
356+
extends:
357+
- .driver-versions-precompiled-ubuntu24.04
358+
- .release-generic
359+
- .release:ngc-variables
360+
rules:
361+
# Only run NGC release job on scheduled pipelines
362+
- if: $CI_PIPELINE_SOURCE == "schedule"
363+
315364
release:ngc-precompiled-ubuntu22.04:
316365
variables:
317366
DIST: signed_ubuntu22.04
@@ -439,6 +488,23 @@ release:ngc-rhel8.10:
439488
- 'echo "Signing the image ${IMAGE_NAME}:${IMAGE_TAG}"'
440489
- ngc-cli/ngc registry image publish --source ${IMAGE_NAME}:${IMAGE_TAG} ${IMAGE_NAME}:${IMAGE_TAG} --public --discoverable --allow-guest --sign --org nvidia
441490

491+
sign:ngc-precompiled-ubuntu24.04:
492+
extends:
493+
- .driver-versions-precompiled-ubuntu24.04
494+
- .dist-ubuntu22.04
495+
- .release-generic
496+
- .release:ngc-variables
497+
- .sign:ngc
498+
variables:
499+
DIST: signed_ubuntu24.04
500+
BASE_TARGET: jammy
501+
PRECOMPILED: "true"
502+
needs:
503+
- release:ngc-precompiled-ubuntu24.04
504+
rules:
505+
# Only run NGC release job on scheduled pipelines
506+
- if: $CI_PIPELINE_SOURCE == "schedule"
507+
442508
sign:ngc-precompiled-ubuntu22.04:
443509
extends:
444510
- .driver-versions-precompiled-ubuntu22.04
@@ -463,6 +529,7 @@ sign:ngc-ubuntu-rhel-rhcos:
463529
matrix:
464530
- SIGN_JOB_NAME: ["ubuntu"]
465531
VERSION: ["24.04"]
532+
DRIVER_VERSION: ["535.216.01", "550.127.05", "565.57.01"]
466533
- SIGN_JOB_NAME: ["ubuntu"]
467534
VERSION: ["22.04"]
468535
DRIVER_VERSION: ["535.216.01", "550.127.05", "565.57.01"]

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(OUT_DIST)
5454
OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
5555

5656
##### Public rules #####
57-
DISTRIBUTIONS := ubuntu18.04 ubuntu20.04 ubuntu22.04 ubuntu24.04 signed_ubuntu20.04 signed_ubuntu22.04 rhel8 rhel9 flatcar fedora36 sles15.3 precompiled_rhcos
57+
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
5858
PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))
5959
BASE_FROM := jammy focal
6060
PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))

‎base/generate-ci-config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ DRIVER_VERSION=$(apt-cache show nvidia-utils-${DRIVER_BRANCH}-server |grep Versi
2424
# Latest supported kernel
2525
SK=$(echo $SUPPORTED_KERNELS | awk '{print $NF}')
2626

27+
# SHIVA
28+
#SK=$(echo $SUPPORTED_KERNELS | awk '{print $(NF-1)}')
29+
2730
# Write to file
2831
echo "export KERNEL_VERSION=$SK DRIVER_VERSION=$DRIVER_VERSION DRIVER_VERSIONS=$DRIVER_VERSION" > /var/kernel_version.txt
2932
echo "KERNEL_VERSION=$SK DRIVER_VERSION=$DRIVER_VERSION DRIVER_VERSIONS=$DRIVER_VERSION"

‎tests/cases/nvidia-driver.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ fi
88

99
# export gpu-operator options
1010
export TEST_CASE_ARGS="$1"
11+
echo "uploading image SHIVA $2"
1112
if [[ $# -eq 2 ]]; then
1213
export IMAGE_PATH="$2"
14+
echo "uploading image SHIVA 1"
1315
sudo ctr -n k8s.io images import "$IMAGE_PATH"
16+
echo "uploading image SHIVA 2"
1417
fi
1518

1619
SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../scripts && pwd )"

‎tests/holodeck.yaml‎ renamed to ‎tests/holodeck_ubuntu22.04.yaml‎

File renamed without changes.

0 commit comments

Comments
 (0)