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

Evan Lezar · Evan Lezar · commit 35a97617853c · 2021-11-24T12:55:37.000Z
Bump for post 3.6.0 development

See merge request nvidia/container-toolkit/container-runtime!67
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-container-runtime
-LIB_VERSION := 3.6.0
-LIB_TAG ?=
+LIB_VERSION := 3.7.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 3.6.0-1 this file is no longer updated, with a changelog
+# entry for a given release generated as part of the packaging step.
+
 nvidia-container-runtime (3.6.0-1) UNRELEASED; urgency=medium
 
   * Promote 3.6.0~rc.3-1 to 3.6.0-1
diff --git a/docker/Dockerfile.amazonlinux b/docker/Dockerfile.amazonlinux
@@ -32,6 +32,7 @@ COPY rpm .
 CMD arch=$(uname -m) && \
     rpmbuild --clean -bb \
              -D "_topdir $PWD" \
+             -D "release_date $(date +'%a %b %d %Y')" \
              -D "version $VERSION" \
              -D "release $RELEASE" \
              -D "toolkit_version $TOOLKIT_VERSION" \
diff --git a/docker/Dockerfile.centos b/docker/Dockerfile.centos
@@ -30,6 +30,7 @@ COPY rpm .
 CMD arch=$(uname -m) && \
     rpmbuild --clean -bb \
              -D "_topdir $PWD" \
+             -D "release_date $(date +'%a %b %d %Y')" \
              -D "version $VERSION" \
              -D "release $RELEASE" \
              -D "toolkit_version $TOOLKIT_VERSION" \
diff --git a/docker/Dockerfile.opensuse-leap b/docker/Dockerfile.opensuse-leap
@@ -32,6 +32,7 @@ COPY rpm .
 CMD arch=$(uname -m) && \
     rpmbuild --clean -bb \
              -D "_topdir $PWD" \
+             -D "release_date $(date +'%a %b %d %Y')" \
              -D "version $VERSION" \
              -D "release $RELEASE" \
              -D "toolkit_version $TOOLKIT_VERSION" \
diff --git a/rpm/SPECS/nvidia-container-runtime.spec b/rpm/SPECS/nvidia-container-runtime.spec
@@ -30,49 +30,7 @@ cp %{SOURCE0} .
 %license LICENSE
 
 %changelog
-* Wed Nov 17 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.6.0-1
-- Promote 3.6.0-0.1.rc.3 to 3.6.0-1
-
-* Mon Nov 08 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.6.0-0.1.rc.3
-- Convert to noarch package
-
-* Thu Nov 04 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.6.0-0.1.rc.2
+# As of 3.6.0-1 we generate the release information automatically
+* %{release_date} NVIDIA CORPORATION <cudatools@nvidia.com> %{version}-%{release}
+- As of 3.6.0-1 the package changelog is generated automatically. This means that releases since 3.6.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
-
-* Thu Apr 29 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.6.0-0.1.rc.1
-- Add AARCH64 package for Amazon Linux 2
-- [BUILD] Allow tag to be specified instead of revision
-- Convert to meta package that depends on nvidia-container-toolkit
-- Remove libseccomp2 dependency
-
-* Thu Apr 29 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.5.0-1
-- Add dependence on nvidia-container-toolkit >= 1.5.0
-- Refactor the whole project for easier extensibility in the future
-- Move main to cmd/nvidia-container-runtime to make it go-installable
-- Switch to logrus for logging and refactor how logging is done
-- Update to Golang 1.16.3
-- Improvements to build and CI system
-- Reorganize the code structure and format it correctly
-
-* Fri Feb 05 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.4.2-1
-- Add dependence on nvidia-container-toolkit >= 1.4.2
-
-* Mon Jan 25 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.4.1-1
-- Update README to list 'compute' as part of the default capabilities
-- Switch to gomod for vendoring
-- Update to Go 1.15.6 for builds
-- Add dependence on nvidia-container-toolkit >= 1.4.1
-
-* Wed Sep 16 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 3.4.0-1
-- Bump version to v3.4.0
-- Add dependence on nvidia-container-toolkit >= 1.3.0
-
-* Wed Jul 08 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 3.3.0-1
-- e550cb15 Update package license to match source license
-- f02eef53 Update project License
-- c0fe8aae Update dependence on nvidia-container-toolkit to 1.2.0
-
-* Fri May 15 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 3.2.0-1
-- e486a70e Update build system to support multi-arch builds
-- 854f4c48 Require new MIG changes
diff --git a/rpm/changelog.old b/rpm/changelog.old
@@ -0,0 +1,46 @@
+* Wed Nov 17 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.6.0-1
+- Promote 3.6.0-0.1.rc.3 to 3.6.0-1
+
+* Mon Nov 08 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.6.0-0.1.rc.3
+- Convert to noarch package
+
+* Thu Nov 04 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.6.0-0.1.rc.2
+- Bump nvidia-container-toolkit dependency to %{toolkit_version}
+- Allow the toolkit version to be specified as a variable
+
+* Thu Apr 29 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.6.0-0.1.rc.1
+- Add AARCH64 package for Amazon Linux 2
+- [BUILD] Allow tag to be specified instead of revision
+- Convert to meta package that depends on nvidia-container-toolkit
+- Remove libseccomp2 dependency
+
+* Thu Apr 29 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.5.0-1
+- Add dependence on nvidia-container-toolkit >= 1.5.0
+- Refactor the whole project for easier extensibility in the future
+- Move main to cmd/nvidia-container-runtime to make it go-installable
+- Switch to logrus for logging and refactor how logging is done
+- Update to Golang 1.16.3
+- Improvements to build and CI system
+- Reorganize the code structure and format it correctly
+
+* Fri Feb 05 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.4.2-1
+- Add dependence on nvidia-container-toolkit >= 1.4.2
+
+* Mon Jan 25 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 3.4.1-1
+- Update README to list 'compute' as part of the default capabilities
+- Switch to gomod for vendoring
+- Update to Go 1.15.6 for builds
+- Add dependence on nvidia-container-toolkit >= 1.4.1
+
+* Wed Sep 16 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 3.4.0-1
+- Bump version to v3.4.0
+- Add dependence on nvidia-container-toolkit >= 1.3.0
+
+* Wed Jul 08 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 3.3.0-1
+- e550cb15 Update package license to match source license
+- f02eef53 Update project License
+- c0fe8aae Update dependence on nvidia-container-toolkit to 1.2.0
+
+* Fri May 15 2020 NVIDIA CORPORATION <cudatools@nvidia.com> 3.2.0-1
+- e486a70e Update build system to support multi-arch builds
+- 854f4c48 Require new MIG changes
