From dcdacc35ff2f153f3154f9411ed0e73e82566614 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 26 Jun 2024 12:03:38 +0200 Subject: [PATCH 1/3] Remove ubuntu18.04 targets Signed-off-by: Evan Lezar --- .common-ci.yml | 22 ------------ .github/workflows/image.yaml | 2 +- .nvidia-ci.yml | 62 ---------------------------------- deployments/container/Makefile | 4 +-- 4 files changed, 3 insertions(+), 87 deletions(-) diff --git a/.common-ci.yml b/.common-ci.yml index 6cd5204..af3acab 100644 --- a/.common-ci.yml +++ b/.common-ci.yml @@ -39,20 +39,13 @@ stages: - release # Define the distribution targets -.dist-ubuntu18.04: - variables: - DIST: ubuntu18.04 - CVE_UPDATES: "libsasl2-2 libsasl2-modules-db" - .dist-ubuntu20.04: variables: DIST: ubuntu20.04 - CVE_UPDATES: "libsasl2-2 libsasl2-modules-db" .dist-ubi8: variables: DIST: ubi8 - CVE_UPDATES: "cyrus-sasl-lib" # Define the platform targets .platform-amd64: @@ -169,14 +162,6 @@ release:staging-vectoradd-ubi8: needs: - image-vectoradd-ubi8 -release:staging-vectoradd-ubuntu18.04: - extends: - - .release:staging - - .dist-ubuntu18.04 - - .sample-vectoradd - needs: - - image-vectoradd-ubuntu18.04 - release:staging-vectoradd-ubuntu20.04: extends: - .release:staging @@ -193,10 +178,3 @@ release:staging-device-query-ubuntu20.04: needs: - image-device-query-ubuntu20.04 -release:staging-nbody-ubuntu18.04: - extends: - - .release:staging - - .dist-ubuntu18.04 - - .sample-nbody - needs: - - image-nbody-ubuntu18.04 diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index b999cd4..43bb74f 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -34,7 +34,7 @@ jobs: strategy: matrix: dist: - - ubuntu18.04 + - ubuntu20.04 - ubi8 sample: - vectorAdd diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml index 6a08bcb..4d0ca68 100644 --- a/.nvidia-ci.yml +++ b/.nvidia-ci.yml @@ -66,12 +66,6 @@ variables: - regctl registry login "${OUT_REGISTRY}" -u "${OUT_REGISTRY_USER}" -p "${OUT_REGISTRY_TOKEN}" - make -f deployments/container/Makefile IMAGE=${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST} OUT_IMAGE=${OUT_IMAGE_NAME}:${OUT_VERSION}-${DIST} push-${DIST} -image-vectoradd-ubuntu18.04: - extends: - - .image-pull - - .dist-ubuntu18.04 - - .sample-vectoradd - image-vectoradd-ubuntu20.04: extends: - .image-pull @@ -90,12 +84,6 @@ image-device-query-ubuntu20.04: - .dist-ubuntu20.04 - .sample-device-query -image-nbody-ubuntu18.04: - extends: - - .image-pull - - .dist-ubuntu18.04 - - .sample-nbody - # The .scan step forms the base of the image scan operation performed before releasing # images. .scan: @@ -128,25 +116,6 @@ image-nbody-ubuntu18.04: - policy_evaluation.json # Define the scan targets -scan-vectoradd-ubuntu18.04-amd64: - extends: - - .scan - - .sample-vectoradd - - .dist-ubuntu18.04 - - .platform-amd64 - needs: - - image-vectoradd-ubuntu18.04 - -scan-vectoradd-ubuntu18.04-arm64: - extends: - - .scan - - .sample-vectoradd - - .dist-ubuntu18.04 - - .platform-arm64 - needs: - - image-vectoradd-ubuntu18.04 - - scan-vectoradd-ubuntu18.04-amd64 - scan-vectoradd-ubuntu20.04-amd64: extends: - .scan @@ -204,25 +173,6 @@ scan-vectoradd-ubi8-arm64: - image-vectoradd-ubi8 - scan-vectoradd-ubi8-amd64 -scan-nbody-ubuntu18.04-amd64: - extends: - - .scan - - .sample-nbody - - .dist-ubuntu18.04 - - .platform-amd64 - needs: - - image-nbody-ubuntu18.04 - -scan-nbody-ubuntu18.04-arm64: - extends: - - .scan - - .sample-nbody - - .dist-ubuntu18.04 - - .platform-arm64 - needs: - - image-nbody-ubuntu18.04 - - scan-nbody-ubuntu18.04-amd64 - # Define external release helpers .release:ngc: extends: @@ -235,12 +185,6 @@ scan-nbody-ubuntu18.04-arm64: # Define the external release targets # Release to NGC -release:ngc-vectoradd-ubuntu18.04: - extends: - - .release:ngc - - .dist-ubuntu18.04 - - .sample-vectoradd - release:ngc-vectoradd-ubuntu20.04: extends: - .release:ngc @@ -258,9 +202,3 @@ release:ngc-vectoradd-ubi8: - .release:ngc - .dist-ubi8 - .sample-vectoradd - -release:ngc-nbody-ubuntu18.04: - extends: - - .release:ngc - - .dist-ubuntu18.04 - - .sample-nbody diff --git a/deployments/container/Makefile b/deployments/container/Makefile index cc842f7..f5ce038 100644 --- a/deployments/container/Makefile +++ b/deployments/container/Makefile @@ -44,8 +44,8 @@ OUT_IMAGE_VERSION ?= $(VERSION) OUT_IMAGE_TAG ?= $(LOWER_CASE_SAMPLE)-$(OUT_IMAGE_VERSION)-$(DIST) OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG) -DEFAULT_PUSH_TARGET := ubuntu18.04 -DISTRIBUTIONS := ubuntu18.04 ubuntu20.04 ubi8 +DEFAULT_PUSH_TARGET := ubuntu20.04 +DISTRIBUTIONS := ubuntu20.04 ubi8 BUILD_TARGETS := $(patsubst %,build-%, $(DISTRIBUTIONS)) PUSH_TARGETS := $(patsubst %,push-%, $(DISTRIBUTIONS)) From 6a587308072df9aa113954475bbac1779a269718 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 26 Jun 2024 12:21:27 +0200 Subject: [PATCH 2/3] Use ubuntu22.04 base images Signed-off-by: Evan Lezar --- .common-ci.yml | 16 ++++----- .github/workflows/image.yaml | 2 +- .nvidia-ci.yml | 44 ++++++++++++------------- deployments/container/Dockerfile.ubuntu | 4 +-- deployments/container/Makefile | 4 +-- 5 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.common-ci.yml b/.common-ci.yml index af3acab..c8acaf6 100644 --- a/.common-ci.yml +++ b/.common-ci.yml @@ -39,9 +39,9 @@ stages: - release # Define the distribution targets -.dist-ubuntu20.04: +.dist-ubuntu22.04: variables: - DIST: ubuntu20.04 + DIST: ubuntu22.04 .dist-ubi8: variables: @@ -162,19 +162,19 @@ release:staging-vectoradd-ubi8: needs: - image-vectoradd-ubi8 -release:staging-vectoradd-ubuntu20.04: +release:staging-vectoradd-ubuntu22.04: extends: - .release:staging - - .dist-ubuntu20.04 + - .dist-ubuntu22.04 - .sample-vectoradd needs: - - image-vectoradd-ubuntu20.04 + - image-vectoradd-ubuntu22.04 -release:staging-device-query-ubuntu20.04: +release:staging-device-query-ubuntu22.04: extends: - .release:staging - - .dist-ubuntu20.04 + - .dist-ubuntu22.04 - .sample-device-query needs: - - image-device-query-ubuntu20.04 + - image-device-query-ubuntu22.04 diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 43bb74f..44a007b 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -34,7 +34,7 @@ jobs: strategy: matrix: dist: - - ubuntu20.04 + - ubuntu22.04 - ubi8 sample: - vectorAdd diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml index 4d0ca68..6c08cb1 100644 --- a/.nvidia-ci.yml +++ b/.nvidia-ci.yml @@ -66,10 +66,10 @@ variables: - regctl registry login "${OUT_REGISTRY}" -u "${OUT_REGISTRY_USER}" -p "${OUT_REGISTRY_TOKEN}" - make -f deployments/container/Makefile IMAGE=${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST} OUT_IMAGE=${OUT_IMAGE_NAME}:${OUT_VERSION}-${DIST} push-${DIST} -image-vectoradd-ubuntu20.04: +image-vectoradd-ubuntu22.04: extends: - .image-pull - - .dist-ubuntu20.04 + - .dist-ubuntu22.04 - .sample-vectoradd image-vectoradd-ubi8: @@ -78,10 +78,10 @@ image-vectoradd-ubi8: - .dist-ubi8 - .sample-vectoradd -image-device-query-ubuntu20.04: +image-device-query-ubuntu22.04: extends: - .image-pull - - .dist-ubuntu20.04 + - .dist-ubuntu22.04 - .sample-device-query # The .scan step forms the base of the image scan operation performed before releasing @@ -116,43 +116,43 @@ image-device-query-ubuntu20.04: - policy_evaluation.json # Define the scan targets -scan-vectoradd-ubuntu20.04-amd64: +scan-vectoradd-ubuntu22.04-amd64: extends: - .scan - .sample-vectoradd - - .dist-ubuntu20.04 + - .dist-ubuntu22.04 - .platform-amd64 needs: - - image-vectoradd-ubuntu20.04 + - image-vectoradd-ubuntu22.04 -scan-vectoradd-ubuntu20.04-arm64: +scan-vectoradd-ubuntu22.04-arm64: extends: - .scan - .sample-vectoradd - - .dist-ubuntu20.04 + - .dist-ubuntu22.04 - .platform-arm64 needs: - - image-vectoradd-ubuntu20.04 - - scan-vectoradd-ubuntu20.04-amd64 + - image-vectoradd-ubuntu22.04 + - scan-vectoradd-ubuntu22.04-amd64 -scan-device-query-ubuntu20.04-amd64: +scan-device-query-ubuntu22.04-amd64: extends: - .scan - .sample-device-query - - .dist-ubuntu20.04 + - .dist-ubuntu22.04 - .platform-amd64 needs: - - image-device-query-ubuntu20.04 + - image-device-query-ubuntu22.04 -scan-device-query-ubuntu20.04-arm64: +scan-device-query-ubuntu22.04-arm64: extends: - .scan - .sample-device-query - - .dist-ubuntu20.04 + - .dist-ubuntu22.04 - .platform-arm64 needs: - - image-device-query-ubuntu20.04 - - scan-device-query-ubuntu20.04-amd64 + - image-device-query-ubuntu22.04 + - scan-device-query-ubuntu22.04-amd64 scan-vectoradd-ubi8-amd64: extends: @@ -185,16 +185,16 @@ scan-vectoradd-ubi8-arm64: # Define the external release targets # Release to NGC -release:ngc-vectoradd-ubuntu20.04: +release:ngc-vectoradd-ubuntu22.04: extends: - .release:ngc - - .dist-ubuntu20.04 + - .dist-ubuntu22.04 - .sample-vectoradd -release:ngc-device-query-ubuntu20.04: +release:ngc-device-query-ubuntu22.04: extends: - .release:ngc - - .dist-ubuntu20.04 + - .dist-ubuntu22.04 - .sample-device-query release:ngc-vectoradd-ubi8: diff --git a/deployments/container/Dockerfile.ubuntu b/deployments/container/Dockerfile.ubuntu index b0e52e5..5ceae99 100644 --- a/deployments/container/Dockerfile.ubuntu +++ b/deployments/container/Dockerfile.ubuntu @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM nvidia/cuda:12.5.0-devel-ubuntu20.04 AS builder +FROM nvidia/cuda:12.5.0-devel-ubuntu22.04 AS builder ARG SAMPLE_NAME ENV SAMPLE_NAME ${SAMPLE_NAME} @@ -41,7 +41,7 @@ RUN curl -L https://codeload.github.com/NVIDIA/cuda-samples/tar.gz/refs/tags/${C make build && \ cp $(find /build/bin -iname "${SAMPLE_NAME}") /build/${SAMPLE_NAME} -FROM nvidia/cuda:12.5.0-base-ubuntu20.04 +FROM nvidia/cuda:12.5.0-base-ubuntu22.04 ARG SAMPLE_NAME LABEL io.k8s.display-name="NVIDIA CUDA ${SAMPLE_NAME} sample" LABEL name="NVIDIA CUDA ${SAMPLE_NAME} sample" diff --git a/deployments/container/Makefile b/deployments/container/Makefile index f5ce038..994f3bc 100644 --- a/deployments/container/Makefile +++ b/deployments/container/Makefile @@ -44,8 +44,8 @@ OUT_IMAGE_VERSION ?= $(VERSION) OUT_IMAGE_TAG ?= $(LOWER_CASE_SAMPLE)-$(OUT_IMAGE_VERSION)-$(DIST) OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG) -DEFAULT_PUSH_TARGET := ubuntu20.04 -DISTRIBUTIONS := ubuntu20.04 ubi8 +DEFAULT_PUSH_TARGET := ubuntu22.04 +DISTRIBUTIONS := ubuntu22.04 ubi8 BUILD_TARGETS := $(patsubst %,build-%, $(DISTRIBUTIONS)) PUSH_TARGETS := $(patsubst %,push-%, $(DISTRIBUTIONS)) From caebe55e55580331f8c0874be351ccf3bc789829 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 26 Jun 2024 15:01:38 +0200 Subject: [PATCH 3/3] Update samples to v12.0 Signed-off-by: Evan Lezar --- versions.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.mk b/versions.mk index 0b0a228..a0207cc 100644 --- a/versions.mk +++ b/versions.mk @@ -17,4 +17,4 @@ VERSION ?= cuda$(shell grep -Eo "FROM.*cuda:[0-9\.]+" deployments/container/Doc # Specify the tag for the https://github.com/NVIDIA/cuda-samples repository. # This need not match the CUDA_VERSION above. -CUDA_SAMPLES_VERSION := v11.6 +CUDA_SAMPLES_VERSION := v12.0