Merge branch 'post-2.7.0-release' into 'master'

Bump post 2.7.0 release See merge request nvidia/container-toolkit/nvidia-docker!32
NVIDIA · Nov 24, 2021 · 2629310 · 2629310
2 parents fd3233a + 9606322
commit 2629310
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 34 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -4,6 +4,12 @@ stages:
   - build-one
   - build-all
 
+variables:
+  # We specify the TOOLKIT_VERSION and TOOLKIT_TAG variable to allow packages
+  # to be built.
+  TOOLKIT_VERSION: 999.999.999
+  TOOLKIT_TAG: dummy
+
 .build-setup: &build-setup
   image: docker:19.03.8
 

diff --git a/Makefile b/Makefile
@@ -13,11 +13,21 @@
 # limitations under the License.
 
 LIB_NAME := nvidia-docker2
-LIB_VERSION := 2.7.0
-LIB_TAG ?=
+LIB_VERSION := 2.8.0
+LIB_TAG ?= rc.1
 
-TOOLKIT_VERSION ?= 1.6.0
-TOOLKIT_TAG ?=
+# Define the nvidia-container-toolkit version on which the nvidia-docker2
+# package depends. It is recommended that the TOOLKIT_TAG and the LIB_TAG match.
+TOOLKIT_VERSION ?= # Set by CI
+TOOLKIT_TAG ?= # Set by CI
+
+ifeq ($(strip $(TOOLKIT_VERSION)),)
+$(error TOOLKIT_VERSION must be specified)
+endif
+
+ifneq ($(TOOLKIT_TAG),$(LIB_TAG))
+$(warning TOOLKIT_TAG=$(TOOLKIT_TAG) and LIB_TAG=$(LIB_TAG) do not match)
+endif
 
 # By default run all native docker-based targets
 docker-native:

diff --git a/debian/changelog.old b/debian/changelog.old
@@ -1,3 +1,6 @@
+# Note: as of 2.7.0-1 this file is no longer updated, with a changelog
+# entry for a given release generated as part of the packaging step.
+
 nvidia-docker2 (2.7.0-1) UNRELEASED; urgency=medium
 
   * Promote 2.7.0~rc.3-1 to 2.7.0-1

diff --git a/docker/Dockerfile.amazonlinux b/docker/Dockerfile.amazonlinux
@@ -33,6 +33,7 @@ RUN sed -i "s;@VERSION@;${PKG_VERS};" $DIST_DIR/nvidia-docker
 
 CMD rpmbuild --clean -bb \
              -D "_topdir $PWD" \
+             -D "release_date $(date +'%a %b %d %Y')" \
              -D "version $VERSION" \
              -D "release $RELEASE" \
              -D "docker_version $DOCKER_VERSION" \

diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos
@@ -33,6 +33,7 @@ RUN sed -i "s;@VERSION@;${PKG_VERS};" $DIST_DIR/nvidia-docker
 
 CMD rpmbuild --clean -bb \
              -D "_topdir $PWD" \
+             -D "release_date $(date +'%a %b %d %Y')" \
              -D "version $VERSION" \
              -D "release $RELEASE" \
              -D "docker_version $DOCKER_VERSION" \

diff --git a/docker/Dockerfile.opensuse-leap b/docker/Dockerfile.opensuse-leap
@@ -33,6 +33,7 @@ RUN sed -i "s;@VERSION@;${PKG_VERS};" $DIST_DIR/nvidia-docker
 
 CMD rpmbuild --clean -bb \
              -D "_topdir $PWD" \
+             -D "release_date $(date +'%a %b %d %Y')" \
              -D "version $VERSION" \
              -D "release $RELEASE" \
              -D "docker_version $DOCKER_VERSION" \

diff --git a/rpm/SPECS/nvidia-docker2.spec b/rpm/SPECS/nvidia-docker2.spec
@@ -37,34 +37,8 @@ install -m 644 -t %{buildroot}/etc/docker daemon.json
 %config /etc/docker/daemon.json
 
 %changelog
-* Wed Nov 17 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.6.0-1
-- Promote 2.7.0-0.1.rc.3 to 2.7.0-1
-
-* Mon Nov 08 2021  NVIDIA CORPORATION <cudatools@nvidia.com> 2.7.0-0.1.rc.3
-
-* Thu Nov 04 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 2.7.0-0.1.rc.2
+# As of 2.7.0-1 we generate the release information automatically
+* %{release_date} NVIDIA CORPORATION <cudatools@nvidia.com> %{version}-%{release}
+- As of 2.7.0-1 the package changelog is generated automatically. This means that releases since 2.7.0-1 all contain this same changelog entry updated for the version being released.
 - Bump nvidia-container-toolkit dependency to %{toolkit_version}
-- Allow the toolkit version to be specified as a variable
-
-* Mon Sep 06 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 2.7.0-0.1.rc.1
-- Add AARCH64 package for Amazon Linux 2
-- [BUILD] Allow for TAG to be specified in Makfile to match other projects
-- Replace nvidia-container-runtime dependence with nvidia-container-toolit > 1.5.1
-
-* Thu Apr 29 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 2.6.0-1
-- Add dependence on nvidia-container-runtime >= 3.5.0
-- Add Jenkinsfile for building packages
-
-* Wed Sep 16 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.5.0-1
-- Bump version to v2.5.0
-- Add dependence on nvidia-container-runtime >= 3.4.0
-- Update readme to point to the official documentatio
-- Add %config directive to daemon.json for RPM installations
-
-* Wed Jul 08 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.4.0-1
-- 09a01276 Update package license to match source license
-- b9c70155 Update dependence on nvidia-container-runtime to 3.3.0
-
-* Fri May 15 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.3.0-1
-- 0d3b049a Update build system to support multi-arch builds
-- 8557216d Require new MIG changes
+- Docker dependency to %{docker_version}
diff --git a/rpm/changelog.old b/rpm/changelog.old
@@ -0,0 +1,31 @@
+* Wed Nov 17 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 2.7.0-1
+- Promote 2.7.0-0.1.rc.3 to 2.7.0-1
+
+* Mon Nov 08 2021  NVIDIA CORPORATION <cudatools@nvidia.com> 2.7.0-0.1.rc.3
+
+* Thu Nov 04 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 2.7.0-0.1.rc.2
+- Bump nvidia-container-toolkit dependency to %{toolkit_version}
+- Allow the toolkit version to be specified as a variable
+
+* Mon Sep 06 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 2.7.0-0.1.rc.1
+- Add AARCH64 package for Amazon Linux 2
+- [BUILD] Allow for TAG to be specified in Makfile to match other projects
+- Replace nvidia-container-runtime dependence with nvidia-container-toolit > 1.5.1
+
+* Thu Apr 29 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 2.6.0-1
+- Add dependence on nvidia-container-runtime >= 3.5.0
+- Add Jenkinsfile for building packages
+
+* Wed Sep 16 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.5.0-1
+- Bump version to v2.5.0
+- Add dependence on nvidia-container-runtime >= 3.4.0
+- Update readme to point to the official documentatio
+- Add %config directive to daemon.json for RPM installations
+
+* Wed Jul 08 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.4.0-1
+- 09a01276 Update package license to match source license
+- b9c70155 Update dependence on nvidia-container-runtime to 3.3.0
+
+* Fri May 15 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 2.3.0-1
+- 0d3b049a Update build system to support multi-arch builds
+- 8557216d Require new MIG changes