UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-22 08:18:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'switch-to-centos7' into 'main'

Browse Source 
Use centos7 packages instead of centos8 packages

See merge request nvidia/container-toolkit/container-toolkit!410
This commit is contained in:
Evan Lezar 2023-05-31 15:17:08 +00:00
commit 7e7c45fb0f
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/container/Makefile
View File

@ -118,7 +118,7 @@ build-ubuntu%: LIBNVIDIA_CONTAINER0_DEPENDENCY=$(LIBNVIDIA_CONTAINER0_VERSION)
build-ubi8: BASE_DIST := ubi8 build-ubi8: BASE_DIST := ubi8
build-ubi8: DOCKERFILE_SUFFIX := centos build-ubi8: DOCKERFILE_SUFFIX := centos
build-ubi8: PACKAGE_DIST = centos8 build-ubi8: PACKAGE_DIST = centos7
build-centos7: BASE_DIST = $(*) build-centos7: BASE_DIST = $(*)
build-centos7: DOCKERFILE_SUFFIX := centos build-centos7: DOCKERFILE_SUFFIX := centos
@ -143,7 +143,7 @@ $(TEST_TARGETS): test-%:
test-packaging: DIST = packaging test-packaging: DIST = packaging
test-packaging: test-packaging:
@echo "Testing package image contents" @echo "Testing package image contents"
@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/ppc64le" || echo "Missing centos7/ppc64le" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/aarch64" || echo "Missing centos7/aarch64"
@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/x86_64" || echo "Missing centos7/x86_64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/x86_64" || echo "Missing centos7/x86_64"
@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/aarch64" || echo "Missing centos8/aarch64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/aarch64" || echo "Missing centos8/aarch64"
@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/ppc64le" || echo "Missing centos8/ppc64le" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/ppc64le" || echo "Missing centos8/ppc64le"

7
scripts/release-kitmaker-artifactory.sh
View File

@ -214,14 +214,13 @@ function create_and_upload() {
} }
# Create archive for x86_64 linux distributions # Create archive for x86_64 linux distributions
create_and_upload "main" "x86_64" "ubuntu18.04-amd64" "centos8-x86_64" create_and_upload "main" "x86_64" "ubuntu18.04-amd64" "centos7-x86_64"
create_and_upload "centos7" "x86_64" "centos7-x86_64"
# Create archive for sbsa linux distributions # Create archive for sbsa linux distributions
create_and_upload "main" "sbsa" "ubuntu18.04-arm64" "centos8-aarch64" create_and_upload "main" "sbsa" "ubuntu18.04-arm64" "centos7-aarch64"
# Create archive for aarch64 linux distributions # Create archive for aarch64 linux distributions
# NOTE: From the perspective of the NVIDIA Container Toolkit aarch64 is just a duplicate of sbsa # NOTE: From the perspective of the NVIDIA Container Toolkit aarch64 is just a duplicate of sbsa
create_and_upload "main" "aarch64" "ubuntu18.04-arm64" "centos8-aarch64" create_and_upload "main" "aarch64" "ubuntu18.04-arm64" "centos7-aarch64"
# Create archive for ppc64le linux distributions # Create archive for ppc64le linux distributions
create_and_upload "main" "ppc64le" "ubuntu18.04-ppc64le" "centos8-ppc64le" create_and_upload "main" "ppc64le" "ubuntu18.04-ppc64le" "centos8-ppc64le"