Skip to content

Commit

Permalink
Merge pull request #956 from NVIDIA/ubi9-base-2
Browse files Browse the repository at this point in the history
update gitlab CI and vfio-manager to use ubi9 DIST
  • Loading branch information
tariq1890 authored Aug 27, 2024
2 parents 23cee4d + 80fa451 commit c75c712
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
12 changes: 6 additions & 6 deletions .common-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ trigger-pipeline:
- '[[ -n "${SKIP_QEMU_SETUP}" ]] || docker run --rm --privileged multiarch/qemu-user-static --reset -p yes'

# Define targets for the gpu-operator and gpu-operator-validator images
.dist-ubi8:
.dist-ubi9:
variables:
DIST: ubi8
DIST: ubi9
CVE_UPDATES: "cyrus-sasl-lib"

.target-gpu-operator:
Expand Down Expand Up @@ -182,23 +182,23 @@ trigger-pipeline:
release:staging-gpu-operator:
extends:
- .release:staging
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator
variables:
OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/gpu-operator"

release:staging-gpu-operator-validator:
extends:
- .release:staging
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator-validator
variables:
OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/gpu-operator-validator"

release:staging-latest-gpu-operator:
extends:
- .release:staging
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator
variables:
OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/gpu-operator"
Expand All @@ -209,7 +209,7 @@ release:staging-latest-gpu-operator:
release:staging-latest-gpu-operator-validator:
extends:
- .release:staging
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator-validator
variables:
OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/staging/gpu-operator-validator"
Expand Down
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@ unit-tests:
build:gpu-operator:
extends:
- .image-build
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator

build:gpu-operator-validator:
extends:
- .image-build
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator-validator

.e2e_defaults:
Expand All @@ -117,7 +117,7 @@ build:gpu-operator-validator:
VALIDATOR_IMAGE: "${CI_REGISTRY_IMAGE}/gpu-operator-validator"
GPU_PRODUCT_NAME: "Tesla-T4"
extends:
- .dist-ubi8
- .dist-ubi9
except:
variables:
- $CI_COMMIT_MESSAGE =~ /skip-end-to-end-tests/
Expand Down
20 changes: 10 additions & 10 deletions .nvidia-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ variables:
image:gpu-operator:
extends:
- .image-pull
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator

image:gpu-operator-validator:
extends:
- .image-pull
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator-validator
variables:
OUT_IMAGE_NAME: "${CI_REGISTRY_IMAGE}/gpu-operator-validator"
Expand Down Expand Up @@ -109,7 +109,7 @@ image:gpu-operator-validator:
.scan:gpu-operator:
extends:
- .scan
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator
needs:
- image:gpu-operator
Expand All @@ -129,7 +129,7 @@ scan:gpu-operator-arm64:
.scan:gpu-operator-validator:
extends:
- .scan
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator-validator
needs:
- image:gpu-operator-validator
Expand Down Expand Up @@ -158,13 +158,13 @@ scan:gpu-operator-validator-arm64:
release:ngc-gpu-operator:
extends:
- .release:ngc
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator

release:ngc-gpu-operator-validator:
extends:
- .release:ngc
- .dist-ubi8
- .dist-ubi9
- .target-gpu-operator-validator
variables:
IN_IMAGE_NAME: "gpu-operator-validator"
Expand Down Expand Up @@ -216,10 +216,10 @@ sign:ngc-gpu-operator:
variables:
IMAGE_TAG: "${CI_COMMIT_TAG}"

sign:ngc-gpu-operator-ubi8:
sign:ngc-gpu-operator-ubi9:
extends:
- .sign:ngc
- .dist-ubi8
- .dist-ubi9
needs:
- release:ngc-gpu-operator

Expand All @@ -232,10 +232,10 @@ sign:ngc-gpu-operator-validator:
IMAGE_NAME: "${NGC_PROD_VALIDATOR_IMAGE}"
IMAGE_TAG: "${CI_COMMIT_TAG}"

sign:ngc-gpu-operator-validator-ubi8:
sign:ngc-gpu-operator-validator-ubi9:
extends:
- .sign:ngc
- .dist-ubi8
- .dist-ubi9
needs:
- release:ngc-gpu-operator-validator
variables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,13 @@ spec:
- name: mig-manager-image
image: nvcr.io/nvidia/cloud-native/k8s-mig-manager@sha256:781fb47e264d9e0fbc8da5bd046e5e678316c866bc36ddd4b56d4eb0de682d5b
- name: init-container-image
image: nvcr.io/nvidia/cuda@sha256:e156f580ea9cae39df4887c80d1f33b4066b99bbe08a20e87bd0e970324d0f18
image: nvcr.io/nvidia/cuda@sha256:9cb5831de5d058e0799c7bec24b5081293d7feff98ea793047deffd1a56b1889
- name: gpu-operator-validator-image
image: registry.gitlab.com/nvidia/kubernetes/gpu-operator/staging/gpu-operator-validator:main-latest-ubi8
- name: k8s-driver-manager-image
image: nvcr.io/nvidia/cloud-native/k8s-driver-manager@sha256:740abc3ff657545c10effd5354f09af525200ed9a1b7623f0c2e8c7bd9e4a4e2
- name: vfio-manager-image
image: nvcr.io/nvidia/cuda@sha256:e156f580ea9cae39df4887c80d1f33b4066b99bbe08a20e87bd0e970324d0f18
image: nvcr.io/nvidia/cuda@sha256:9cb5831de5d058e0799c7bec24b5081293d7feff98ea793047deffd1a56b1889
- name: sandbox-device-plugin-image
image: nvcr.io/nvidia/kubevirt-gpu-device-plugin@sha256:969147c01d63be5d1fe458f32f1cc0c7408cf3062531db91408e2fc57b4d8a67
- name: vgpu-device-manager-image
Expand Down Expand Up @@ -874,9 +874,9 @@ spec:
- name: "MIG_MANAGER_IMAGE"
value: "nvcr.io/nvidia/cloud-native/k8s-mig-manager@sha256:781fb47e264d9e0fbc8da5bd046e5e678316c866bc36ddd4b56d4eb0de682d5b"
- name: "CUDA_BASE_IMAGE"
value: "nvcr.io/nvidia/cuda@sha256:e156f580ea9cae39df4887c80d1f33b4066b99bbe08a20e87bd0e970324d0f18"
value: "nvcr.io/nvidia/cuda@sha256:9cb5831de5d058e0799c7bec24b5081293d7feff98ea793047deffd1a56b1889"
- name: "VFIO_MANAGER_IMAGE"
value: "nvcr.io/nvidia/cuda@sha256:e156f580ea9cae39df4887c80d1f33b4066b99bbe08a20e87bd0e970324d0f18"
value: "nvcr.io/nvidia/cuda@sha256:9cb5831de5d058e0799c7bec24b5081293d7feff98ea793047deffd1a56b1889"
- name: "SANDBOX_DEVICE_PLUGIN_IMAGE"
value: "nvcr.io/nvidia/kubevirt-gpu-device-plugin@sha256:969147c01d63be5d1fe458f32f1cc0c7408cf3062531db91408e2fc57b4d8a67"
- name: "VGPU_DEVICE_MANAGER_IMAGE"
Expand Down
4 changes: 2 additions & 2 deletions deployments/gpu-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ operator:
initContainer:
image: cuda
repository: nvcr.io/nvidia
version: 12.6.0-base-ubi8
version: 12.6.0-base-ubi9
imagePullPolicy: IfNotPresent
tolerations:
- key: "node-role.kubernetes.io/master"
Expand Down Expand Up @@ -468,7 +468,7 @@ vfioManager:
enabled: true
repository: nvcr.io/nvidia
image: cuda
version: 12.6.0-base-ubi8
version: 12.6.0-base-ubi9
imagePullPolicy: IfNotPresent
imagePullSecrets: []
env: []
Expand Down

0 comments on commit c75c712

Please sign in to comment.