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

Merge branch 'remove-amazonlinux1' into 'master'

Browse Source 
Remove building of Amazonlinux1 packages

See merge request nvidia/container-toolkit/container-toolkit!98
This commit is contained in:
Evan Lezar 2022-01-24 12:31:35 +00:00
commit 53c130fb3c
7 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.common-ci.yml
View File

@ -35,10 +35,6 @@ stages:
- build-all - build-all
# Define the distribution targets # Define the distribution targets
.dist-amazonlinux1:
variables:
DIST: amazonlinux1
.dist-amazonlinux2: .dist-amazonlinux2:
variables: variables:
DIST: amazonlinux2 DIST: amazonlinux2

7
.gitlab-ci.yml
View File

@ -103,12 +103,6 @@ unit-tests:
- ${ARTIFACTS_ROOT} - ${ARTIFACTS_ROOT}
# Define the package build targets # Define the package build targets
package-amazonlinux1-x86_64:
extends:
- .package-build
- .dist-amazonlinux1
- .arch-x86_64
package-amazonlinux2-aarch64: package-amazonlinux2-aarch64:
extends: extends:
- .package-build - .package-build
@ -259,7 +253,6 @@ image-packaging:
- .package-artifacts - .package-artifacts
- .dist-packaging - .dist-packaging
needs: needs:
- package-amazonlinux1-x86_64
- package-amazonlinux2-aarch64 - package-amazonlinux2-aarch64
- package-amazonlinux2-x86_64 - package-amazonlinux2-x86_64
- package-centos7-ppc64le - package-centos7-ppc64le

1
build/container/Makefile
View File

@ -119,7 +119,6 @@ $(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/amazonlinux1/x86_64" || echo "Missing amazonlinux1/x86_64"
@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/amazonlinux2/aarch64" || echo "Missing amazonlinux2/aarch64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/amazonlinux2/aarch64" || echo "Missing amazonlinux2/aarch64"
@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/amazonlinux2/x86_64" || echo "Missing amazonlinux2/x86_64" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/amazonlinux2/x86_64" || echo "Missing amazonlinux2/x86_64"
@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/ppc64le" || echo "Missing centos7/ppc64le" @$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/ppc64le" || echo "Missing centos7/ppc64le"

2
docker/docker.mk
View File

@ -14,7 +14,7 @@
# Supported OSs by architecture # Supported OSs by architecture
AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9 AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9
X86_64_TARGETS := centos7 centos8 rhel7 rhel8 amazonlinux1 amazonlinux2 opensuse-leap15.1 X86_64_TARGETS := centos7 centos8 rhel7 rhel8 amazonlinux2 opensuse-leap15.1
PPC64LE_TARGETS := ubuntu18.04 ubuntu16.04 centos7 centos8 rhel7 rhel8 PPC64LE_TARGETS := ubuntu18.04 ubuntu16.04 centos7 centos8 rhel7 rhel8
ARM64_TARGETS := ubuntu20.04 ubuntu18.04 ARM64_TARGETS := ubuntu20.04 ubuntu18.04
AARCH64_TARGETS := centos8 rhel8 amazonlinux2 AARCH64_TARGETS := centos8 rhel8 amazonlinux2

2
packaging/debian/changelog
View File

@ -1,5 +1,7 @@
nvidia-container-toolkit (1.8.0~rc.2-1) UNRELEASED; urgency=medium nvidia-container-toolkit (1.8.0~rc.2-1) UNRELEASED; urgency=medium
* Remove support for building amazonlinux1 packages
-- NVIDIA CORPORATION <cudatools@nvidia.com> Thu, 20 Jan 2022 13:38:48 +0100 -- NVIDIA CORPORATION <cudatools@nvidia.com> Thu, 20 Jan 2022 13:38:48 +0100
nvidia-container-toolkit (1.8.0~rc.1-1) UNRELEASED; urgency=medium nvidia-container-toolkit (1.8.0~rc.1-1) UNRELEASED; urgency=medium

1
packaging/rpm/SPECS/nvidia-container-toolkit.spec
View File

@ -65,6 +65,7 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
%changelog %changelog
* Thu Jan 20 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.8.0-0.1.rc.2 * Thu Jan 20 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.8.0-0.1.rc.2
- Remove support for building amazonlinux1 packages
* Wed Dec 08 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.8.0-0.1.rc.1 * Wed Dec 08 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.8.0-0.1.rc.1
- [libnvidia-container] Add support for cgroupv2 - [libnvidia-container] Add support for cgroupv2

1
scripts/release.sh
View File

@ -28,7 +28,6 @@ PROJECT_ROOT="$( cd ${SCRIPTS_DIR}/.. && pwd )"
# to the relevant repositories. This targets forwarded to the build-all-components script # to the relevant repositories. This targets forwarded to the build-all-components script
# can be overridden by specifying command line arguments. # can be overridden by specifying command line arguments.
all=( all=(
amazonlinux1-x86_64
amazonlinux2-aarch64 amazonlinux2-aarch64
amazonlinux2-x86_64 amazonlinux2-x86_64
centos7-ppc64le centos7-ppc64le