Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove centos7 support, bump cuda and go versions #23

Merged
merged 1 commit into from
Apr 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .common-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,6 @@ trigger-pipeline:
variables:
DIST: rhel9

.dist-centos7:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to add a note to the centos7 folder in the repo to indicate that it is no longer supported?

variables:
DIST: centos7

.dist-fedora36:
variables:
DIST: fedora36
Expand Down Expand Up @@ -278,13 +274,6 @@ release:staging-rhel9:
needs:
- image-rhel9

release:staging-centos7:
extends:
- .release:staging
- .dist-centos7
needs:
- image-centos7

.release:staging-precompiled:
stage: release
variables:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
- ubuntu20.04
- ubuntu22.04
- rhel8
- centos7
- rhel9
- fedora36
ispr:
Expand Down
5 changes: 0 additions & 5 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,6 @@ image-rhel9:
- .image-build-rhel9
- .dist-rhel9

image-centos7:
extends:
- .image-build
- .dist-centos7

image-fedora36:
extends:
- .image-build
Expand Down
18 changes: 0 additions & 18 deletions .nvidia-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,6 @@ image-rhel9:
- .dist-rhel9
- .driver-versions-rhel9

image-centos7:
extends:
- .image-pull
- .dist-centos7

# The .scan step forms the base of the image scan operation performed before releasing
# images.
.scan-generic:
Expand Down Expand Up @@ -283,14 +278,6 @@ scan-rhel9-arm64:
needs:
- image-rhel9

scan-centos7-amd64:
extends:
- .scan
- .dist-centos7
- .platform-amd64
needs:
- image-centos7

.release:ngc-variables:
variables:
OUT_REGISTRY_USER: "${NGC_REGISTRY_USER}"
Expand Down Expand Up @@ -328,11 +315,6 @@ release:ngc-precompiled-ubuntu22.04:
# Only run NGC release job on scheduled pipelines
- if: $CI_PIPELINE_SOURCE == "schedule"

release:ngc-centos7:
extends:
- .release:ngc
- .dist-centos7

release:ngc-rhcos4.9:
extends:
- .release:ngc
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(OUT_DIST)
OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)

##### Public rules #####
DISTRIBUTIONS := ubuntu18.04 ubuntu20.04 ubuntu22.04 signed_ubuntu20.04 signed_ubuntu22.04 rhel8 rhel9 centos7 flatcar fedora36 sles15.3 precompiled_rhcos
DISTRIBUTIONS := ubuntu18.04 ubuntu20.04 ubuntu22.04 signed_ubuntu20.04 signed_ubuntu22.04 rhel8 rhel9 flatcar fedora36 sles15.3 precompiled_rhcos
PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))
BASE_FROM := jammy focal
PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))
Expand Down
7 changes: 0 additions & 7 deletions ci/localbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,6 @@ driver_container_build_ubuntu()
driver_container_build_simple "ubuntu16.04"
}

driver_container_build_centos()
{
driver_container_build_simple "centos7"
driver_container_build_simple "centos8"
}

driver_container_build_rhel()
{
driver_container_build_simple "rhel7"
Expand Down Expand Up @@ -118,7 +112,6 @@ ngc_push()

driver_container_build_ubuntu
driver_container_build_rhel
driver_container_build_centos

list_all_containers

Expand Down
21 changes: 0 additions & 21 deletions ci/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ fi
SSH_KEY=${SSH_KEY:-${HOME}/.ssh/id_rsa}

UBUNTU_VERSIONS=${UBUNTU_VERSIONS:-"16.04 18.04 20.04"}
CENTOS_VERSIONS=${CENTOS_VERSIONS:-"7 8"}

mk_long_version() {
local -r linux_version="${1}" platform="${2}"
Expand Down Expand Up @@ -53,13 +52,6 @@ latest_ubuntu_kernel() {
| head -n 1"
}

latest_centos_kernel() {
docker run --rm centos:"${1}" /bin/bash -c\
"yum install -y yum-utils &> /dev/null && repoquery kernel-headers \
| cut -d ':' -f 2 \
| tail -n 1"
}

latest_rhel_kernel() {
if [[ "${1}" -eq 7 ]]; then
docker run --rm centos:"${1}" /bin/bash -c\
Expand Down Expand Up @@ -172,19 +164,6 @@ for version in ${UBUNTU_VERSIONS}; do
fi
done

# Resolving Centos versions
for version in ${CENTOS_VERSIONS}; do
log "Generating tags for Centos ${version}"

centos_kernel=$(latest_centos_kernel "${version}")
centos_tag_long="$(mk_long_version "${centos_kernel}" "centos${version}")"

if [[ -n ${FORCE} ]] || ! tag_exists "${centos_tag_long}" "${tags}"; then
centos_tag_short="$(mk_short_version "centos${version}")"
build "centos${version}" "${centos_tag_long}" "${centos_tag_short}" "${centos_kernel}"
fi
done

build "rhel7" "${CONTAINER_VERSION}-rhel7" "$(mk_short_version rhel7)" ""
build "rhel8" "${CONTAINER_VERSION}-rhel8" "$(mk_short_version rhel8)" ""
build "rhel9" "${CONTAINER_VERSION}-rhel9" "$(mk_short_version rhel9)" ""
Expand Down
1 change: 0 additions & 1 deletion multi-arch.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ $(DRIVER_PUSH_TARGETS): push-%:
build-ubuntu18.04%: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
build-signed_ubuntu20.04%: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
build-signed_ubuntu22.04%: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
build-centos7%: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
build-sles%: DOCKER_BUILD_PLATFORM_OPTIONS = --platform=linux/amd64
2 changes: 1 addition & 1 deletion rhel8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SHELL ["/bin/bash", "-c"]

RUN dnf install -y git wget

ENV GOLANG_VERSION=1.22.1
ENV GOLANG_VERSION=1.22.2

# download appropriate binary based on the target architecture for multi-arch builds
RUN OS_ARCH=${TARGETARCH/x86_64/amd64} && OS_ARCH=${OS_ARCH/aarch64/arm64} && \
Expand Down
2 changes: 1 addition & 1 deletion rhel9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SHELL ["/bin/bash", "-c"]

RUN dnf install -y git wget

ENV GOLANG_VERSION=1.22.1
ENV GOLANG_VERSION=1.22.2

# download appropriate binary based on the target architecture for multi-arch builds
RUN OS_ARCH=${TARGETARCH/x86_64/amd64} && OS_ARCH=${OS_ARCH/aarch64/arm64} && \
Expand Down
2 changes: 1 addition & 1 deletion ubuntu20.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
git && \
rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION=1.22.1
ENV GOLANG_VERSION=1.22.2

# download appropriate binary based on the target architecture for multi-arch builds
RUN OS_ARCH=${TARGETARCH/x86_64/amd64} && OS_ARCH=${OS_ARCH/aarch64/arm64} && \
Expand Down
2 changes: 1 addition & 1 deletion ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
git && \
rm -rf /var/lib/apt/lists/*

ENV GOLANG_VERSION=1.22.1
ENV GOLANG_VERSION=1.22.2

# download appropriate binary based on the target architecture for multi-arch builds
RUN OS_ARCH=${TARGETARCH/x86_64/amd64} && OS_ARCH=${OS_ARCH/aarch64/arm64} && \
Expand Down
2 changes: 1 addition & 1 deletion versions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# DRIVER_VERSIONS contains latest version in all active datacenter branches
DRIVER_VERSIONS ?= 470.239.06 535.161.08 550.54.15

CUDA_VERSION := 12.3.2
CUDA_VERSION := 12.4.1
2 changes: 1 addition & 1 deletion vgpu/src/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module vgpu-util

go 1.20
go 1.22.2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we revert this instead? This indicate the MINIMUM go version required and does not affect the tooling choice.


require (
github.com/sirupsen/logrus v1.9.3
Expand Down
1 change: 1 addition & 0 deletions vgpu/src/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=