From b1c9b8bb490eb14f4aee8e35de50879717e4fdf0 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 20 Jan 2022 13:40:17 +0100 Subject: [PATCH 1/3] Bump version to 1.8.0-rc.2 Signed-off-by: Evan Lezar --- packaging/debian/changelog | 8 ++++++-- packaging/rpm/SPECS/nvidia-container-toolkit.spec | 2 ++ versions.mk | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 54c8899c..c488f612 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,9 +1,13 @@ -nvidia-container-toolkit (1.8.0~rc.1-1) experimental; urgency=medium +nvidia-container-toolkit (1.8.0~rc.2-1) UNRELEASED; urgency=medium + + -- NVIDIA CORPORATION Thu, 20 Jan 2022 13:38:48 +0100 + +nvidia-container-toolkit (1.8.0~rc.1-1) UNRELEASED; urgency=medium * [libnvidia-container] Add support for cgroupv2 * Release toolkit-container images from nvidia-container-toolkit repository - -- NVIDIA CORPORATION Wed, 08 Dec 2021 12:56:49 +010 + -- NVIDIA CORPORATION Wed, 08 Dec 2021 12:56:49 +0100 nvidia-container-toolkit (1.7.0-1) UNRELEASED; urgency=medium diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index 4f5ad861..04c48731 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -64,6 +64,8 @@ rm -f %{_bindir}/nvidia-container-runtime-hook /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json %changelog +* Thu Jan 20 2022 NVIDIA CORPORATION 1.8.0-0.1.rc.2 + * Wed Dec 08 2021 NVIDIA CORPORATION 1.8.0-0.1.rc.1 - [libnvidia-container] Add support for cgroupv2 - Release toolkit-container images from nvidia-container-toolkit repository diff --git a/versions.mk b/versions.mk index ff75c4d7..36c7fe5e 100644 --- a/versions.mk +++ b/versions.mk @@ -14,7 +14,7 @@ LIB_NAME := nvidia-container-toolkit LIB_VERSION := 1.8.0 -LIB_TAG := rc.1 +LIB_TAG := rc.2 # Specify the nvidia-docker2 and nvidia-container-runtime package versions NVIDIA_DOCKER_VERSION := 2.9.0 From 9d34134b3fc931740d4dc57172a2fea8e51082ab Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 20 Jan 2022 13:41:32 +0100 Subject: [PATCH 2/3] Update git submodules Signed-off-by: Evan Lezar --- third_party/libnvidia-container | 2 +- third_party/nvidia-container-runtime | 2 +- third_party/nvidia-docker | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index 0b7fa90c..b6f85bb4 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit 0b7fa90ce0721b010a5e80ecf53ceb43280a33b4 +Subproject commit b6f85bb45e23eae0447999501fe37c07877e9058 diff --git a/third_party/nvidia-container-runtime b/third_party/nvidia-container-runtime index e54e25d6..3588013b 160000 --- a/third_party/nvidia-container-runtime +++ b/third_party/nvidia-container-runtime @@ -1 +1 @@ -Subproject commit e54e25d6402da53cbb1c073d7a5d7f1e07d252a2 +Subproject commit 3588013b7d2a15783b3ca417b6f992197313ad5b diff --git a/third_party/nvidia-docker b/third_party/nvidia-docker index 9d1e4134..51d3c9e2 160000 --- a/third_party/nvidia-docker +++ b/third_party/nvidia-docker @@ -1 +1 @@ -Subproject commit 9d1e41341776ffb58728adbe0f265d68f497e07d +Subproject commit 51d3c9e22b2b891773ab9525eaf7b3ce1c014ab1 From 41c1c2312a672894a4079a64f1d516ad86abc330 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Thu, 20 Jan 2022 14:42:37 +0100 Subject: [PATCH 3/3] Add check for matching toolkit and lib versions to release script Signed-off-by: Evan Lezar --- scripts/release.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/scripts/release.sh b/scripts/release.sh index 5b0e74ee..34ae8570 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -53,6 +53,16 @@ else fi eval $(${SCRIPTS_DIR}/get-component-versions.sh) + +if [[ "${NVIDIA_CONTAINER_TOOLKIT_VERSION}${NVIDIA_CONTAINER_TOOLKIT_TAG:+~${NVIDIA_CONTAINER_TOOLKIT_TAG}}" != "${LIBNVIDIA_CONTAINER_VERSION}" ]]; then + set +x + echo "The libnvidia-container and nvidia-container-toolkit versions do not match." + echo "lib: '${LIBNVIDIA_CONTAINER_VERSION}'" + echo "toolkit: '${NVIDIA_CONTAINER_TOOLKIT_VERSION}${NVIDIA_CONTAINER_TOOLKIT_TAG:+~${NVIDIA_CONTAINER_TOOLKIT_TAG}}'" + set -x + [[ ${ALLOW_VERSION_MISMATCH} == "true" ]] || exit 1 +fi + export NVIDIA_CONTAINER_TOOLKIT_VERSION export NVIDIA_CONTAINER_TOOLKIT_TAG export NVIDIA_CONTAINER_RUNTIME_VERSION