Skip to content

Commit 98aece2

Browse files
committed
e2e test
1 parent 2018331 commit 98aece2

File tree

2 files changed

+56
-1
lines changed

2 files changed

+56
-1
lines changed

.nvidia-ci.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ image-rhel9:
121121
- .dist-rhel9
122122
- .driver-versions-rhel9
123123

124+
image-amzn2023:
125+
extends:
126+
- .image-pull
127+
- .dist-amzn2023
128+
- .driver-versions-amzn2023
129+
124130
# The .scan step forms the base of the image scan operation performed before releasing
125131
# images.
126132
.scan-generic:
@@ -190,6 +196,18 @@ image-rhel9:
190196
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
191197
- !reference [.pipeline-trigger-rules, rules]
192198

199+
.scan-amzn2023:
200+
# Repeat for each DRIVER_VERSION
201+
extends:
202+
- .driver-versions-amzn2023
203+
- .scan-generic
204+
rules:
205+
- !reference [.scan-rules-common, rules]
206+
- if: $CI_PIPELINE_SOURCE == "schedule"
207+
when: never
208+
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
209+
- !reference [.pipeline-trigger-rules, rules]
210+
193211
.scan-precompiled-ubuntu22.04:
194212
variables:
195213
DIST: signed_ubuntu22.04
@@ -235,6 +253,14 @@ scan-ubuntu22.04-arm64:
235253
needs:
236254
- image-ubuntu22.04
237255

256+
scan-amzn2023-amd64:
257+
extends:
258+
- .scan-amzn2023
259+
- .dist-amzn2023
260+
- .platform-amd64
261+
needs:
262+
- image-amzn2023
263+
238264
scan-precompiled-ubuntu22.04-amd64:
239265
variables:
240266
PLATFORM: linux/amd64
@@ -302,6 +328,12 @@ release:ngc-ubuntu22.04:
302328
- .dist-ubuntu22.04
303329
- .driver-versions-ubuntu22.04
304330

331+
release:ngc-amzn2023:
332+
extends:
333+
- .release:ngc
334+
- .dist-amzn2023
335+
- .driver-versions-amzn2023
336+
305337
release:ngc-precompiled-ubuntu22.04:
306338
variables:
307339
DIST: signed_ubuntu22.04
@@ -478,6 +510,9 @@ sign:ngc-ubuntu-rhel-rhcos:
478510
- SIGN_JOB_NAME: ["ubuntu"]
479511
VERSION: ["20.04"]
480512
DRIVER_VERSION: ["535.183.06", "550.90.12", "560.35.03"]
513+
- SIGN_JOB_NAME: ["amzn"]
514+
VERSION: ["2023"]
515+
DRIVER_VERSION: ["560.35.03"]
481516
- SIGN_JOB_NAME: ["rhel"]
482517
VERSION: ["8.8", "8.10"]
483518
DRIVER_VERSION: ["535.183.06", "550.90.12", "560.35.03"]

Makefile

Lines changed: 21 additions & 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 signed_ubuntu20.04 signed_ubuntu22.04 rhel8 rhel9 flatcar fedora36 sles15.3 precompiled_rhcos
57+
DISTRIBUTIONS := ubuntu18.04 ubuntu20.04 ubuntu22.04 amzn2023 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))
@@ -92,6 +92,10 @@ pull-signed_ubuntu22.04%: DIST = ubuntu22.04
9292
pull-signed_ubuntu22.04%: DRIVER_TAG = $(DRIVER_BRANCH)
9393
pull-signed_ubuntu22.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
9494

95+
pull-signed_amzn2023%: DIST = amzn2023
96+
pull-signed_amzn2023%: DRIVER_TAG = $(DRIVER_BRANCH)
97+
pull-signed_amzn2023%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
98+
9599
PLATFORM ?= linux/amd64
96100
$(DRIVER_PULL_TARGETS): pull-%:
97101
$(DOCKER) pull "--platform=$(PLATFORM)" "$(IMAGE)"
@@ -109,6 +113,10 @@ archive-signed_ubuntu22.04%: DIST = ubuntu22.04
109113
archive-signed_ubuntu22.04%: DRIVER_TAG = $(DRIVER_BRANCH)
110114
archive-signed_ubuntu22.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
111115

116+
archive-signed_amzn2023%: DIST = amzn2023
117+
archive-signed_amzn2023%: DRIVER_TAG = $(DRIVER_BRANCH)
118+
archive-signed_amzn2023%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
119+
112120
$(DRIVER_ARCHIVE_TARGETS): archive-%:
113121
$(DOCKER) save "$(IMAGE)" -o "archive.tar"
114122

@@ -130,6 +138,11 @@ push-signed_ubuntu22.04%: DRIVER_TAG = $(DRIVER_BRANCH)
130138
push-signed_ubuntu22.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
131139
push-signed_ubuntu22.04%: OUT_IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
132140

141+
push-signed_amzn2023%: DIST = amzn2023
142+
push-signed_amzn2023%: DRIVER_TAG = $(DRIVER_BRANCH)
143+
push-signed_amzn2023%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
144+
push-signed_amzn2023%: OUT_IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
145+
133146
# $(DRIVER_BUILD_TARGETS) is in the form of build-$(DIST)-$(DRIVER_VERSION)
134147
# Parse the target to set the required variables.
135148
build-%: DIST = $(word 2,$(subst -, ,$@))
@@ -175,6 +188,13 @@ build-signed_ubuntu22.04%: DRIVER_TAG = $(DRIVER_BRANCH)
175188
build-signed_ubuntu22.04%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
176189
build-signed_ubuntu22.04%: DOCKER_BUILD_ARGS = --build-arg KERNEL_VERSION="$(KERNEL_VERSION)"
177190

191+
# amzn2023 Precompiled Driver
192+
build-signed_amzn2023%: DIST = amzn2023
193+
build-signed_amzn2023%: DRIVER_TAG = $(DRIVER_BRANCH)
194+
build-signed_amzn2023%: IMAGE_TAG = $(DRIVER_BRANCH)-$(KERNEL_VERSION)-$(DIST)
195+
build-signed_amzn2023%: DOCKER_BUILD_ARGS = --build-arg KERNEL_VERSION="$(KERNEL_VERSION)"
196+
# build-signed_amzn2023%: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
197+
178198
# base is an image used to poll Canonical for the latest kernel version
179199
build-base-%: DOCKERFILE = $(CURDIR)/base/Dockerfile
180200
build-base-%: TARGET = $(word 3,$(subst -, ,$@))

0 commit comments

Comments
 (0)