Skip to content

Commit

Permalink
remove references to EOL'd driver branches - R525,R470
Browse files Browse the repository at this point in the history
Signed-off-by: Tariq Ibrahim <[email protected]>
  • Loading branch information
tariq1890 committed Aug 15, 2024
1 parent fc2ab3f commit 600b7bf
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .common-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ default:
command: ["--experimental"]

variables:
DRIVER_VERSIONS: 470.256.02 535.183.06 550.90.07
DRIVER_VERSIONS: 535.183.06 550.90.07
BUILD_MULTI_ARCH_IMAGES: "true"

stages:
Expand Down Expand Up @@ -73,7 +73,7 @@ trigger-pipeline:
.driver-versions:
parallel:
matrix:
- DRIVER_VERSION: [470.256.02, 535.183.06, 550.90.07]
- DRIVER_VERSION: [535.183.06, 550.90.07]

# Define the driver versions for jobs that can be run in parallel for ubuntu22.04
.driver-versions-ubuntu22.04:
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ jobs:
strategy:
matrix:
driver:
- 470.256.02
- 535.183.06
- 550.90.07
dist:
Expand All @@ -56,10 +55,6 @@ jobs:
- ispr: true
dist: ubuntu20.04
driver: 550.90.07
- driver: 470.256.02
dist: ubuntu22.04
- driver: 470.256.02
dist: rhel9
fail-fast: false
steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions .nvidia-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -502,10 +502,10 @@ sign:ngc-ubuntu-rhel-rhcos:
DRIVER_VERSION: ["535.183.06", "550.90.07"]
- SIGN_JOB_NAME: ["ubuntu"]
VERSION: ["20.04"]
DRIVER_VERSION: ["470.256.02", "535.183.06", "550.90.07"]
DRIVER_VERSION: ["535.183.06", "550.90.07"]
- SIGN_JOB_NAME: ["rhel"]
VERSION: ["8.6", "8.7", "8.8", "8.9","8.10"]
DRIVER_VERSION: ["470.256.02", "535.183.06", "550.90.07"]
DRIVER_VERSION: ["535.183.06", "550.90.07"]
- SIGN_JOB_NAME: ["rhcos"]
VERSION: ["4.9", "4.10", "4.11", "4.12","4.13","4.14","4.15"]
DRIVER_VERSION: ["470.256.02", "535.183.06", "550.90.07"]
DRIVER_VERSION: ["535.183.06", "550.90.07"]
4 changes: 2 additions & 2 deletions rhel8/precompiled/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ DOCKERFILE = Dockerfile
RHEL_VERSION ?= 8.6
CUDA_VERSION ?= 12.1.0
CUDA_DIST ?= ubi8
DRIVER_VERSION ?= 525.105.17
DRIVER_VERSION ?= 535.183.06
KERNEL_VERSION ?= 4.18.0-372.51.1.el8_6.x86_64
TARGET_ARCH = $(shell echo "${KERNEL_VERSION}" | awk -F. '{print $$NF}')
CONTAINER_TOOL ?= docker
Expand Down Expand Up @@ -59,4 +59,4 @@ image: rhsm-register
image-push:
@echo "!=== Pushing image ===!"
${CONTAINER_TOOL} push \
${IMAGE_REGISTRY}/${IMAGE_NAME}:${DRIVER_VERSION}-${KERNEL_VERSION}-${OS_TAG}
${IMAGE_REGISTRY}/${IMAGE_NAME}:${DRIVER_VERSION}-${KERNEL_VERSION}-${OS_TAG}
14 changes: 7 additions & 7 deletions rhel8/precompiled/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ The procedure is based on [building custom kmod packages](https://github.com/NVI
export DRIVER_TOOLKIT_IMAGE=quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6afc764e57b39493f57dd20a714cf9bee8cd02a34bf361570f68888b4af753ad
export KERNEL_VERSION=4.18.0-372.51.1.el8_6.x86_64
export RHEL_VERSION=8.6
export KERNEL_VERSION=4.18.0-513.9.1.el8_9.x86_64
export RHEL_VERSION=8.9
export CUDA_VERSION=12.1.0
export CUDA_DIST=ubi8
export DRIVER_EPOCH=1
export DRIVER_VERSION=525.105.17
export OS_TAG=rhcos4.12
export DRIVER_VERSION=535.183.06
export OS_TAG=rhcos4.13
make image image-push
```
Expand All @@ -66,7 +66,7 @@ The procedure is based on [building custom kmod packages](https://github.com/NVI
## NVIDIA GPU operator
In order to be used with the NVIDIA GPU Operator on Red Hat OpenShift, the image tag must follow the format `${DRIVER_VERSION}-${KERNEL_VERSION}-${OS_TAG}`, and the full name will look like `nvcr.io/nvidia/driver:525.105.17-4.18.0-372.51.1.el8_6.x86_64-rhcos4.12`.
In order to be used with the NVIDIA GPU Operator on Red Hat OpenShift, the image tag must follow the format `${DRIVER_VERSION}-${KERNEL_VERSION}-${OS_TAG}`, and the full name will look like `nvcr.io/nvidia/driver:535.183.06-4.18.0-513.9.1.el8_9.x86_64-rhcos4.13`.
Define the `ClusterPolicy` resource to make use of the pre-compiled driver image, e.g.:
Expand All @@ -76,7 +76,7 @@ Define the `ClusterPolicy` resource to make use of the pre-compiled driver image
usePrecompiled: true
image: driver
repository: nvcr.io/nvidia
version: 525.105.17
version: 535.183.06
```
Find more information in the [Precompiled Driver Containers](https://docs.nvidia.com/datacenter/cloud-native/gpu-operator/latest/precompiled-drivers.html) documentation.
Find more information in the [Precompiled Driver Containers](https://docs.nvidia.com/datacenter/cloud-native/gpu-operator/latest/precompiled-drivers.html) documentation.
2 changes: 1 addition & 1 deletion ubuntu20.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ENV DEBIAN_FRONTEND=noninteractive
# Arg to indicate if driver type is either of passthrough(baremetal) or vgpu
ARG DRIVER_TYPE=passthrough
ENV DRIVER_TYPE=$DRIVER_TYPE
ARG DRIVER_BRANCH=525
ARG DRIVER_BRANCH=535
ENV DRIVER_BRANCH=$DRIVER_BRANCH
ARG VGPU_LICENSE_SERVER_TYPE=NLS
ENV VGPU_LICENSE_SERVER_TYPE=$VGPU_LICENSE_SERVER_TYPE
Expand Down
2 changes: 1 addition & 1 deletion ubuntu20.04/precompiled/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM nvcr.io/nvidia/cuda:12.5.1-base-ubuntu20.04

ENV DEBIAN_FRONTEND=noninteractive

ARG DRIVER_BRANCH=470
ARG DRIVER_BRANCH=535
ENV DRIVER_BRANCH=$DRIVER_BRANCH

ENV NVIDIA_VISIBLE_DEVICES=void
Expand Down
2 changes: 1 addition & 1 deletion ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ENV DEBIAN_FRONTEND=noninteractive
# Arg to indicate if driver type is either of passthrough(baremetal) or vgpu
ARG DRIVER_TYPE=passthrough
ENV DRIVER_TYPE=$DRIVER_TYPE
ARG DRIVER_BRANCH=525
ARG DRIVER_BRANCH=535
ENV DRIVER_BRANCH=$DRIVER_BRANCH
ARG VGPU_LICENSE_SERVER_TYPE=NLS
ENV VGPU_LICENSE_SERVER_TYPE=$VGPU_LICENSE_SERVER_TYPE
Expand Down
6 changes: 3 additions & 3 deletions ubuntu22.04/precompiled/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ FROM nvcr.io/nvidia/cuda:12.5.1-base-ubuntu22.04

ENV DEBIAN_FRONTEND=noninteractive

ARG DRIVER_BRANCH=525
ARG DRIVER_BRANCH=535
ENV DRIVER_BRANCH=$DRIVER_BRANCH
ARG DRIVER_VERSION=525.147.05
ARG DRIVER_VERSION=535.183.06
ENV DRIVER_VERSION=$DRIVER_VERSION

ARG KERNEL_VERSION=5.15.0-60-generic
ARG KERNEL_VERSION=5.15.0-116-generic
ENV KERNEL_VERSION=$KERNEL_VERSION

ENV NVIDIA_VISIBLE_DEVICES=void
Expand Down
2 changes: 1 addition & 1 deletion versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
# limitations under the License.

# DRIVER_VERSIONS contains latest version in all active datacenter branches
DRIVER_VERSIONS ?= 470.256.02 535.183.06 550.90.07
DRIVER_VERSIONS ?= 535.183.06 550.90.07

CUDA_VERSION := 12.5.1

0 comments on commit 600b7bf

Please sign in to comment.