Skip to content

Commit c272d4f

Browse files
committed
update CI pipeline to support 580.65.06 and remove unsupported OCP versions
Signed-off-by: Tariq Ibrahim <[email protected]>
1 parent 5c8db7d commit c272d4f

File tree

2 files changed

+50
-19
lines changed

2 files changed

+50
-19
lines changed

.common-ci.yml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ trigger-pipeline:
8383
matrix:
8484
- DRIVER_VERSION: [535.261.03, 570.172.08, 580.65.06]
8585

86+
# Define the driver versions for jobs that can be run in parallel
87+
.driver-versions-ubuntu20.04:
88+
parallel:
89+
matrix:
90+
- DRIVER_VERSION: [535.261.03, 570.172.08]
91+
8692
# Define the driver versions for jobs that can be run in parallel
8793
.driver-versions-ubuntu24.04:
8894
parallel:
@@ -183,6 +189,14 @@ trigger-pipeline:
183189
# Since OUT_IMAGE_NAME and OUT_VERSION are set, this will push the CI image to the target
184190
- if [[ "${PRECOMPILED}" == "true" ]]; then ./scripts/precompiled.sh push; else make push-${DIST}-${DRIVER_VERSION}; fi
185191

192+
.release-ubuntu20.04:
193+
# Perform for each DRIVER_VERSION
194+
extends:
195+
- .release-generic
196+
- .driver-versions-ubuntu20.04
197+
rules:
198+
- if: $CI_PIPELINE_SOURCE != "schedule"
199+
186200
.release-ubuntu22.04:
187201
# Perform for each DRIVER_VERSION
188202
extends:
@@ -227,6 +241,15 @@ trigger-pipeline:
227241
OUT_REGISTRY: "${NGC_REGISTRY}"
228242
OUT_IMAGE_NAME: "${NGC_STAGING_REGISTRY}/driver"
229243

244+
.release:staging-ubuntu20.04:
245+
extends:
246+
- .release-ubuntu20.04
247+
variables:
248+
OUT_REGISTRY_USER: "${NGC_REGISTRY_USER}"
249+
OUT_REGISTRY_TOKEN: "${NGC_REGISTRY_TOKEN}"
250+
OUT_REGISTRY: "${NGC_REGISTRY}"
251+
OUT_IMAGE_NAME: "${NGC_STAGING_REGISTRY}/driver"
252+
230253
.release:staging-ubuntu22.04:
231254
extends:
232255
- .release-ubuntu22.04
@@ -296,7 +319,7 @@ trigger-pipeline:
296319

297320
release:staging-ubuntu20.04:
298321
extends:
299-
- .release:staging
322+
- .release:staging-ubuntu20.04
300323
- .dist-ubuntu20.04
301324
needs:
302325
- image-ubuntu20.04

.nvidia-ci.yml

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,15 @@ image-precompiled-ubuntu24.04:
101101
- .driver-versions-precompiled-ubuntu24.04
102102
- .image-pull-generic
103103

104+
.image-pull-ubuntu20.04:
105+
# Perform for each DRIVER_VERSION
106+
extends:
107+
- .driver-versions-ubuntu20.04
108+
- .image-pull-generic
109+
rules:
110+
- if: $CI_PIPELINE_SOURCE == "schedule"
111+
when: never
112+
- !reference [.image-pull-rules, rules]
104113

105114
.image-pull-ubuntu22.04:
106115
# Perform for each DRIVER_VERSION
@@ -128,7 +137,7 @@ image-precompiled-ubuntu22.04:
128137

129138
image-ubuntu20.04:
130139
extends:
131-
- .image-pull
140+
- .image-pull-ubuntu20.04
132141
- .dist-ubuntu20.04
133142

134143
image-ubuntu22.04:
@@ -208,6 +217,18 @@ image-rhel9:
208217
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
209218
- !reference [.pipeline-trigger-rules, rules]
210219

220+
.scan-ubuntu20.04:
221+
# Repeat for each DRIVER_VERSION
222+
extends:
223+
- .driver-versions-ubuntu20.04
224+
- .scan-generic
225+
rules:
226+
- !reference [.scan-rules-common, rules]
227+
- if: $CI_PIPELINE_SOURCE == "schedule"
228+
when: never
229+
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
230+
- !reference [.pipeline-trigger-rules, rules]
231+
211232
.scan-ubuntu22.04:
212233
# Repeat for each DRIVER_VERSION
213234
extends:
@@ -259,15 +280,15 @@ image-rhel9:
259280
# Define the scan targets
260281
scan-ubuntu20.04-amd64:
261282
extends:
262-
- .scan
283+
- .scan-ubuntu20.04
263284
- .dist-ubuntu20.04
264285
- .platform-amd64
265286
needs:
266287
- image-ubuntu20.04
267288

268289
scan-ubuntu20.04-arm64:
269290
extends:
270-
- .scan
291+
- .scan-ubuntu20.04
271292
- .dist-ubuntu20.04
272293
- .platform-arm64
273294
needs:
@@ -372,6 +393,7 @@ release:ngc-ubuntu20.04:
372393
extends:
373394
- .release:ngc
374395
- .dist-ubuntu20.04
396+
- .driver-versions-ubuntu20.04
375397

376398
release:ngc-ubuntu22.04:
377399
extends:
@@ -409,20 +431,6 @@ release:ngc-precompiled-ubuntu22.04:
409431
rules:
410432
- !reference [.precompiled-rules, rules]
411433

412-
release:ngc-rhcos4.12:
413-
extends:
414-
- .release:ngc
415-
- .dist-rhel8
416-
variables:
417-
OUT_DIST: "rhcos4.12"
418-
419-
release:ngc-rhcos4.13:
420-
extends:
421-
- .release:ngc
422-
- .dist-rhel8
423-
variables:
424-
OUT_DIST: "rhcos4.13"
425-
426434
release:ngc-rhcos4.14:
427435
extends:
428436
- .release:ngc
@@ -597,7 +605,7 @@ sign:ngc-ubuntu-rhel-rhcos:
597605
DRIVER_VERSION: ["535.261.03", "570.172.08", "580.65.06"]
598606
- SIGN_JOB_NAME: ["ubuntu"]
599607
VERSION: ["20.04"]
600-
DRIVER_VERSION: ["535.261.03", "570.172.08", "580.65.06"]
608+
DRIVER_VERSION: ["535.261.03", "570.172.08"]
601609
- SIGN_JOB_NAME: ["rhel"]
602610
VERSION: ["8.8", "8.10", "9.4", "9.5", "9.6"]
603611
DRIVER_VERSION: ["535.261.03", "570.172.08", "580.65.06"]

0 commit comments

Comments
 (0)