From e05686cbe8c5a84ab7e84d193b1551945f1250a2 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 31 May 2023 16:26:43 +0200 Subject: [PATCH 1/2] Use centos7 packages for ubi8 image Signed-off-by: Evan Lezar --- build/container/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/container/Makefile b/build/container/Makefile index 6ec570fa..a16a89d9 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -118,7 +118,7 @@ build-ubuntu%: LIBNVIDIA_CONTAINER0_DEPENDENCY=$(LIBNVIDIA_CONTAINER0_VERSION) build-ubi8: BASE_DIST := ubi8 build-ubi8: DOCKERFILE_SUFFIX := centos -build-ubi8: PACKAGE_DIST = centos8 +build-ubi8: PACKAGE_DIST = centos7 build-centos7: BASE_DIST = $(*) build-centos7: DOCKERFILE_SUFFIX := centos @@ -143,7 +143,7 @@ $(TEST_TARGETS): test-%: test-packaging: DIST = packaging test-packaging: @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/centos8/aarch64" || echo "Missing centos8/aarch64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/ppc64le" || echo "Missing centos8/ppc64le" From 61f515b3dd0f15c1899cee39d7429f29a2809021 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 31 May 2023 16:28:54 +0200 Subject: [PATCH 2/2] Use centos7 packages in kitmaker archives Signed-off-by: Evan Lezar --- scripts/release-kitmaker-artifactory.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/release-kitmaker-artifactory.sh b/scripts/release-kitmaker-artifactory.sh index 9ac00d5f..13d0d087 100755 --- a/scripts/release-kitmaker-artifactory.sh +++ b/scripts/release-kitmaker-artifactory.sh @@ -214,14 +214,13 @@ function create_and_upload() { } # Create archive for x86_64 linux distributions -create_and_upload "main" "x86_64" "ubuntu18.04-amd64" "centos8-x86_64" -create_and_upload "centos7" "x86_64" "centos7-x86_64" +create_and_upload "main" "x86_64" "ubuntu18.04-amd64" "centos7-x86_64" # 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 # 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_and_upload "main" "ppc64le" "ubuntu18.04-ppc64le" "centos8-ppc64le"