From 1db3f49d1d3b7fc65582005091133af1b90a8925 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 26 Jun 2024 16:18:03 +0200 Subject: [PATCH 1/2] Remove gitlab CI definition Signed-off-by: Evan Lezar --- .gitlab-ci.yml | 61 -------------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index e469f93..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include: - - local: '.common-ci.yml' - -# Define the image build targets -.image-build: - stage: image-build - variables: - IMAGE_NAME: "${CI_REGISTRY_IMAGE}/cuda-samples" - VERSION: "${CI_COMMIT_SHORT_SHA}" - PUSH_ON_BUILD: "true" - before_script: - - !reference [.buildx-setup, before_script] - - apk add --no-cache bash make - - 'echo "Logging in to CI registry ${CI_REGISTRY}"' - - docker login -u "${CI_REGISTRY_USER}" -p "${CI_REGISTRY_PASSWORD}" "${CI_REGISTRY}" - script: - - make -f deployments/container/Makefile build-${DIST} - -image-vectoradd-ubuntu18.04: - extends: - - .image-build - - .dist-ubuntu18.04 - - .sample-vectoradd - -image-vectoradd-ubuntu20.04: - extends: - - .image-build - - .dist-ubuntu20.04 - - .sample-vectoradd - -image-device-query-ubuntu20.04: - extends: - - .image-build - - .dist-ubuntu20.04 - - .sample-device-query - -image-vectoradd-ubi8: - extends: - - .image-build - - .dist-ubi8 - - .sample-vectoradd - -image-nbody-ubuntu18.04: - extends: - - .image-build - - .dist-ubuntu18.04 - - .sample-nbody From 58f4380ba5737b936981e4a9150173c05b6f170c Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 26 Jun 2024 16:18:14 +0200 Subject: [PATCH 2/2] Use GitHub staging registry Signed-off-by: Evan Lezar --- .nvidia-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml index e314414..6a08bcb 100644 --- a/.nvidia-ci.yml +++ b/.nvidia-ci.yml @@ -33,14 +33,14 @@ variables: # On the multi-arch builder we don't need the qemu setup. SKIP_QEMU_SETUP: "1" # Define the public staging registry - STAGING_REGISTRY: registry.gitlab.com/nvidia/container-images/samples/staging + STAGING_REGISTRY: ghcr.io/nvidia STAGING_VERSION: ${CI_COMMIT_SHORT_SHA} .image-pull: stage: image-build variables: IN_REGISTRY: "${STAGING_REGISTRY}" - IN_IMAGE_NAME: cuda-samples + IN_IMAGE_NAME: k8s-samples IN_VERSION: "${LOWER_CASE_SAMPLE}-${STAGING_VERSION}" OUT_REGISTRY_USER: "${CI_REGISTRY_USER}" OUT_REGISTRY_TOKEN: "${CI_REGISTRY_PASSWORD}"