From 1b3e2d9423b3122fd86a13d5b5b27a63537a6df3 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 8 Nov 2021 11:22:17 +0100 Subject: [PATCH 1/6] Bump version post v1.6.0-rc.2 release Signed-off-by: Evan Lezar --- Makefile | 2 +- build/container/Makefile | 2 +- packaging/debian/changelog | 8 +++++++- packaging/rpm/SPECS/nvidia-container-toolkit.spec | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 15458521..97fe3b5a 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ DIST_DIR ?= $(CURDIR)/dist LIB_NAME := nvidia-container-toolkit LIB_VERSION := 1.6.0 -LIB_TAG ?= rc.2 +LIB_TAG ?= rc.3 GOLANG_VERSION := 1.16.3 MODULE := github.com/NVIDIA/nvidia-container-toolkit diff --git a/build/container/Makefile b/build/container/Makefile index 065ce6dd..ed036156 100644 --- a/build/container/Makefile +++ b/build/container/Makefile @@ -21,7 +21,7 @@ DIST_DIR ?= $(CURDIR)/dist # TODO: These should be defined ONCE and currently duplicate the version in the # toolkit makefile. LIB_VERSION := 1.6.0 -LIB_TAG := rc.2 +LIB_TAG := rc.3 VERSION ?= $(LIB_VERSION)$(if $(LIB_TAG),-$(LIB_TAG)) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 7cda74a0..26ea10b6 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,8 +1,14 @@ +nvidia-container-toolkit (1.6.0~rc.3-1) experimental; urgency=medium + + * Move OCI and command line checks for runtime to internal oci package + + -- NVIDIA CORPORATION Mon, 15 Nov 2021 13:02:23 +0100 + nvidia-container-toolkit (1.6.0~rc.2-1) experimental; urgency=medium * Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime - -- NVIDIA CORPORATION Tue, 26 Oct 2021 12:24:05 +0200 + -- NVIDIA CORPORATION Fri, 05 Nov 2021 12:24:05 +0200 nvidia-container-toolkit (1.6.0~rc.1-1) experimental; urgency=medium diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec index 2e0bd3db..93f78b6d 100644 --- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec +++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec @@ -64,8 +64,11 @@ rm -f %{_bindir}/nvidia-container-runtime-hook /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json %changelog +* Mon Nov 15 2021 NVIDIA CORPORATION 1.6.0-0.1.rc.3 -* Tue Oct 26 2021 NVIDIA CORPORATION 1.6.0-0.1.rc.2 +- Move OCI and command line checks for runtime to internal oci package + +* Fri Nov 05 2021 NVIDIA CORPORATION 1.6.0-0.1.rc.2 - Use relative path to OCI specification file (config.json) if bundle path is not specified as an argument to the nvidia-container-runtime From 060f6702321f41bd98055c3a377300544cb6e623 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 15 Nov 2021 13:06:42 +0100 Subject: [PATCH 2/6] Update libnvidia-container submodule to 1.6.0-rc.3 Signed-off-by: Evan Lezar --- third_party/libnvidia-container | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index badec1fa..3bca465e 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit badec1fa4a2c085aa9396f95b6bb1d69f1c7996b +Subproject commit 3bca465e82ce5843e6b4428596c00ee0c3db7696 From 684b5e9237fe4d2ce96699f1f297545498282eb1 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 15 Nov 2021 16:29:51 +0100 Subject: [PATCH 3/6] Update libnvidia-container to ff6ed3d5637f0537c4951a2757512108cc0ae147 Signed-off-by: Evan Lezar --- third_party/libnvidia-container | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container index 3bca465e..ff6ed3d5 160000 --- a/third_party/libnvidia-container +++ b/third_party/libnvidia-container @@ -1 +1 @@ -Subproject commit 3bca465e82ce5843e6b4428596c00ee0c3db7696 +Subproject commit ff6ed3d5637f0537c4951a2757512108cc0ae147 From 6a747f5dd3404d918a03ce56b6c9af197a59a918 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 16 Nov 2021 09:49:13 +0100 Subject: [PATCH 4/6] Update submodules Signed-off-by: Evan Lezar --- third_party/nvidia-container-runtime | 2 +- third_party/nvidia-docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/third_party/nvidia-container-runtime b/third_party/nvidia-container-runtime index 037ec4c3..ba4815e7 160000 --- a/third_party/nvidia-container-runtime +++ b/third_party/nvidia-container-runtime @@ -1 +1 @@ -Subproject commit 037ec4c39a2fe28c3c8d4992a269a9d7bbbeafa7 +Subproject commit ba4815e7eb31c23d839d58c94623ec53f4e8d368 diff --git a/third_party/nvidia-docker b/third_party/nvidia-docker index 9de312f5..34934c28 160000 --- a/third_party/nvidia-docker +++ b/third_party/nvidia-docker @@ -1 +1 @@ -Subproject commit 9de312f595157d2176a8a3ada8a1b5bb62414578 +Subproject commit 34934c282707a1dc3f4341ead20a9e40d36ee618 From 5db520564791a532a7ed3ffb5f9ba3faed0f381e Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Mon, 8 Nov 2021 14:06:14 +0100 Subject: [PATCH 5/6] Get tags for all components in get-component-versions script Signed-off-by: Evan Lezar --- scripts/get-component-versions.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/get-component-versions.sh b/scripts/get-component-versions.sh index 758078be..268f8551 100755 --- a/scripts/get-component-versions.sh +++ b/scripts/get-component-versions.sh @@ -60,4 +60,6 @@ if [[ "${libnvidia_container_version_tag}" != "${nvidia_container_toolkit_versio >&2 echo "WARNING: The libnvidia-container and nvidia-container-toolkit versions do not match" fi echo "NVIDIA_CONTAINER_RUNTIME_VERSION=${nvidia_container_runtime_version}" +echo "NVIDIA_CONTAINER_RUNTIME_TAG=${nvidia_container_runtime_tag}" echo "NVIDIA_DOCKER_VERSION=${nvidia_docker_version}" +echo "NVIDIA_DOCKER_TAG=${nvidia_docker_tag}" From bc1f6e05a0f6bd32a99b07fd356df243f8921f9d Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Tue, 16 Nov 2021 09:53:32 +0100 Subject: [PATCH 6/6] Check for matching tags in 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 e436d899..3341c7f0 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -56,6 +56,16 @@ eval $(${SCRIPTS_DIR}/get-component-versions.sh) export NVIDIA_CONTAINER_TOOLKIT_VERSION export NVIDIA_CONTAINER_TOOLKIT_TAG +if [[ "${NVIDIA_CONTAINER_TOOLKIT_TAG}" != "${NVIDIA_CONTAINER_RUNTIME_TAG}" ]]; then + echo "ERROR: The nvidia-container-runtime and nvidia-container-toolkit version tags do not match" + exit 1 +fi + +if [[ "${NVIDIA_CONTAINER_TOOLKIT_TAG}" != "${NVIDIA_DOCKER_TAG}" ]]; then + echo "ERROR: The nvidia-docker and nvidia-container-toolkit version tags do not match" + exit 1 +fi + for target in ${targets[@]}; do ${SCRIPTS_DIR}/build-all-components.sh ${target} done