Merge branch 'bump-1.9.0' into 'master'

Bump version to 1.9.0

See merge request nvidia/container-toolkit/container-toolkit!118

.common-ci.yml

@@ -75,6 +75,11 @@ stages:
     DIST: ubuntu18.04
     CVE_UPDATES: "libsasl2-2 libsasl2-modules-db"
 
+.dist-ubuntu20.04:
+  variables:
+    DIST: ubuntu20.04
+    CVE_UPDATES: "libsasl2-2 libsasl2-modules-db"
+
 .dist-packaging:
   variables:
     DIST: packaging
@@ -229,6 +234,16 @@ release:staging-ubuntu18.04:
     - test-crio-ubuntu18.04
     - test-docker-ubuntu18.04
 
+release:staging-ubuntu20.04:
+  extends:
+    - .release:staging
+    - .dist-ubuntu20.04
+  needs:
+    - test-toolkit-ubuntu20.04
+    - test-containerd-ubuntu20.04
+    - test-crio-ubuntu20.04
+    - test-docker-ubuntu20.04
+
 release:staging-packaging:
   extends:
     - .release:staging

.gitlab-ci.yml

@@ -262,6 +262,16 @@ image-ubuntu18.04:
     - package-ubuntu18.04-arm64
     - package-ubuntu18.04-ppc64le
 
+image-ubuntu20.04:
+  extends:
+    - .image-build
+    - .package-artifacts
+    - .dist-ubuntu20.04
+  needs:
+    - package-ubuntu18.04-amd64
+    - package-ubuntu18.04-arm64
+    - package-ubuntu18.04-ppc64le
+
 # The DIST=packaging target creates an image containing all built packages
 image-packaging:
   extends:
@@ -343,3 +353,31 @@ test-docker-ubuntu18.04:
   needs:
     - image-ubuntu18.04
 
+test-toolkit-ubuntu20.04:
+  extends:
+    - .test:toolkit
+    - .dist-ubuntu20.04
+  needs:
+    - image-ubuntu20.04
+
+test-containerd-ubuntu20.04:
+  extends:
+    - .test:containerd
+    - .dist-ubuntu20.04
+  needs:
+    - image-ubuntu20.04
+
+test-crio-ubuntu20.04:
+  extends:
+    - .test:crio
+    - .dist-ubuntu20.04
+  needs:
+    - image-ubuntu20.04
+
+test-docker-ubuntu20.04:
+  extends:
+    - .test:docker
+    - .dist-ubuntu20.04
+  needs:
+    - image-ubuntu20.04
+

.nvidia-ci.yml

@@ -85,6 +85,11 @@ image-ubuntu18.04:
     - .image-pull
     - .dist-ubuntu18.04
 
+image-ubuntu20.04:
+  extends:
+    - .image-pull
+    - .dist-ubuntu20.04
+
 # The DIST=packaging target creates an image containing all built packages
 image-packaging:
   extends:
@@ -183,6 +188,23 @@ scan-ubuntu18.04-arm64:
     - image-ubuntu18.04
     - scan-ubuntu18.04-amd64
 
+scan-ubuntu20.04-amd64:
+  extends:
+    - .scan
+    - .dist-ubuntu20.04
+    - .platform-amd64
+  needs:
+    - image-ubuntu20.04
+
+scan-ubuntu20.04-arm64:
+  extends:
+    - .scan
+    - .dist-ubuntu20.04
+    - .platform-arm64
+  needs:
+    - image-ubuntu20.04
+    - scan-ubuntu20.04-amd64
+
 scan-ubi8-amd64:
   extends:
     - .scan
@@ -226,6 +248,13 @@ release:staging-ubuntu18.04:
   needs:
     - image-ubuntu18.04
 
+release:staging-ubuntu20.04:
+  extends:
+    - .release:staging
+    - .dist-ubuntu20.04
+  needs:
+    - image-ubuntu20.04
+
 # Define the external release targets
 # Release to NGC
 release:ngc-centos7:
@@ -238,11 +267,16 @@ release:ngc-centos8:
     - .release:ngc
     - .dist-centos8
 
-release:ngc-ubuntu18:
+release:ngc-ubuntu18.04:
   extends:
     - .release:ngc
     - .dist-ubuntu18.04
 
+release:ngc-ubuntu20.04:
+  extends:
+    - .release:ngc
+    - .dist-ubuntu20.04
+
 release:ngc-ubi8:
   extends:
     - .release:ngc
@@ -259,11 +293,16 @@ release:dockerhub-centos8:
     - .release:dockerhub
     - .dist-centos8
 
-release:dockerhub-ubuntu18:
+release:dockerhub-ubuntu18.04:
   extends:
     - .release:dockerhub
     - .dist-ubuntu18.04
 
+release:dockerhub-ubuntu20.04:
+  extends:
+    - .release:dockerhub
+    - .dist-ubuntu20.04
+
 release:dockerhub-ubi8:
   extends:
     - .release:dockerhub

build/container/Dockerfile.ubuntu

@@ -40,7 +40,7 @@ COPY . .
 RUN GOPATH=/artifacts go install -ldflags="-s -w -X 'main.Version=${VERSION}'" ./tools/...
 
 
-FROM nvidia/cuda:${CUDA_VERSION}-base-${BASE_DIST}
+FROM nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-${BASE_DIST}
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && apt-get install -y --no-install-recommends \

packaging/debian/changelog

@@ -1,8 +1,14 @@
-nvidia-container-toolkit (1.9.0~rc.1-1) experimental; urgency=medium
+nvidia-container-toolkit (1.9.0-1) UNRELEASED; urgency=medium
 
+ * [libnvidia-container] Add additional check for Tegra in /sys/.../family file in CLI
+ * [libnvidia-container] Update jetpack-specific CLI option to only load Base CSV files by default
+ * [libnvidia-container] Fix bug (from 1.8.0) when mounting GSP firmware into containers without /lib to /usr/lib symlinks
+ * [libnvidia-container] Update nvml.h to CUDA 11.6.1 nvML_DEV 11.6.55
+ * [libnvidia-container] Update switch statement to include new brands from latest nvml.h
+ * [libnvidia-container] Process all --require flags on Jetson platforms
  * [libnvidia-container] Fix long-standing issue with running ldconfig on Debian systems
 
- -- NVIDIA CORPORATION <cudatools@nvidia.com> Fri, 18 Feb 2022 16:05:11 +0200
+ -- NVIDIA CORPORATION <cudatools@nvidia.com> Fri, 18 Mar 2022 06:10:56 +0200
 
 nvidia-container-toolkit (1.8.1-1) UNRELEASED; urgency=medium
 

packaging/rpm/SPECS/nvidia-container-toolkit.spec

@@ -64,7 +64,7 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
 /usr/share/containers/oci/hooks.d/oci-nvidia-hook.json
 
 %changelog
-* Fri Feb 18 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.9.0-0.1.rc.1
+* Fri Mar 18 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.9.0-1
 - [libnvidia-container] Add additional check for Tegra in /sys/.../family file in CLI
 - [libnvidia-container] Update jetpack-specific CLI option to only load Base CSV files by default
 - [libnvidia-container] Fix bug (from 1.8.0) when mounting GSP firmware into containers without /lib to /usr/lib symlinks

third_party/libnvidia-container

@@ -1 +1 @@
-Subproject commit b84f27a79aceac0b48358281c8c509b18d68e082
+Subproject commit 5e135c17d6dbae861ec343e9a8d3a0d2af758a4f

versions.mk

@@ -14,7 +14,7 @@
 
 LIB_NAME := nvidia-container-toolkit
 LIB_VERSION := 1.9.0
-LIB_TAG := rc.1
+LIB_TAG :=
 
 # Specify the nvidia-docker2 and nvidia-container-runtime package versions.
 # Note: The tag is automatically specified to match LIB_TAG.