From 30dff6137679884c608194d920c74654e3a3a046 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Mon, 27 Feb 2023 12:28:46 +0200
Subject: [PATCH 1/6] Remove debian9 packages from CI

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 .common-ci.yml              | 7 -------
 .gitlab-ci.yml              | 8 --------
 build/container/Makefile    | 1 -
 scripts/build-packages.sh   | 1 -
 scripts/release-packages.sh | 1 -
 5 files changed, 18 deletions(-)

diff --git a/.common-ci.yml b/.common-ci.yml
index afd01f50..b3f79222 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -70,13 +70,6 @@ stages:
     DIST: debian10
     PACKAGE_REPO_TYPE: debian
 
-.dist-debian9:
-  rules:
-    - !reference [.main-or-manual, rules]
-  variables:
-    DIST: debian9
-    PACKAGE_REPO_TYPE: debian
-
 .dist-opensuse-leap15.1:
   rules:
     - !reference [.main-or-manual, rules]
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0517f9c7..322f7fa5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -152,12 +152,6 @@ package-debian10-amd64:
     - .dist-debian10
     - .arch-amd64
 
-package-debian9-amd64:
-  extends:
-    - .package-build
-    - .dist-debian9
-    - .arch-amd64
-
 package-opensuse-leap15.1-x86_64:
   extends:
     - .package-build
@@ -286,8 +280,6 @@ image-packaging:
       optional: true
     - job: package-debian10-amd64
       optional: true
-    - job: package-debian9-amd64
-      optional: true
     - job: package-opensuse-leap15.1-x86_64
       optional: true
     - job: package-ubuntu16.04-amd64
diff --git a/build/container/Makefile b/build/container/Makefile
index 808a6c0f..7a7c0ef2 100644
--- a/build/container/Makefile
+++ b/build/container/Makefile
@@ -142,7 +142,6 @@ test-packaging:
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/ppc64le" || echo "Missing centos8/ppc64le"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/x86_64" || echo "Missing centos8/x86_64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/debian10/amd64" || echo "Missing debian10/amd64"
-	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/debian9/amd64" || echo "Missing debian9/amd64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/opensuse-leap15.1/x86_64" || echo "Missing opensuse-leap15.1/x86_64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu16.04/amd64" || echo "Missing ubuntu16.04/amd64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu16.04/ppc64le" || echo "Missing ubuntu16.04/ppc64le"
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh
index 89e28eda..5eb1bdbb 100755
--- a/scripts/build-packages.sh
+++ b/scripts/build-packages.sh
@@ -35,7 +35,6 @@ all=(
     centos8-ppc64le
     centos8-x86_64
     debian10-amd64
-    debian9-amd64
     fedora35-aarch64
     fedora35-x86_64
     opensuse-leap15.1-x86_64
diff --git a/scripts/release-packages.sh b/scripts/release-packages.sh
index 253df007..37f2528a 100755
--- a/scripts/release-packages.sh
+++ b/scripts/release-packages.sh
@@ -164,7 +164,6 @@ all=(
     centos8-ppc64le
     centos8-x86_64
     debian10-amd64
-    debian9-amd64
     fedora35-aarch64
     fedora35-x86_64
     opensuse-leap15.1-x86_64

From 9a5c1bbe4852e04f60510802c8ef57d8664134bb Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Mon, 27 Feb 2023 12:29:35 +0200
Subject: [PATCH 2/6] Remove ubuntu16.04 packages from CI

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 .common-ci.yml              |  7 -------
 .gitlab-ci.yml              | 16 ----------------
 build/container/Makefile    |  2 --
 scripts/build-packages.sh   |  2 --
 scripts/release-packages.sh |  2 --
 5 files changed, 29 deletions(-)

diff --git a/.common-ci.yml b/.common-ci.yml
index b3f79222..569b5d05 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -85,13 +85,6 @@ stages:
     CVE_UPDATES: "cyrus-sasl-lib"
     PACKAGE_REPO_TYPE: rpm
 
-.dist-ubuntu16.04:
-  rules:
-    - !reference [.main-or-manual, rules]
-  variables:
-    DIST: ubuntu16.04
-    PACKAGE_REPO_TYPE: debian
-
 .dist-ubuntu18.04:
   variables:
     DIST: ubuntu18.04
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 322f7fa5..121eebe7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -158,18 +158,6 @@ package-opensuse-leap15.1-x86_64:
     - .dist-opensuse-leap15.1
     - .arch-x86_64
 
-package-ubuntu16.04-amd64:
-  extends:
-    - .package-build
-    - .dist-ubuntu16.04
-    - .arch-amd64
-
-package-ubuntu16.04-ppc64le:
-  extends:
-    - .package-build
-    - .dist-ubuntu16.04
-    - .arch-ppc64le
-
 package-ubuntu18.04-amd64:
   extends:
     - .package-build
@@ -282,10 +270,6 @@ image-packaging:
       optional: true
     - job: package-opensuse-leap15.1-x86_64
       optional: true
-    - job: package-ubuntu16.04-amd64
-      optional: true
-    - job: package-ubuntu16.04-ppc64le
-      optional: true
     - job: package-ubuntu18.04-ppc64le
       optional: true
 
diff --git a/build/container/Makefile b/build/container/Makefile
index 7a7c0ef2..522b51f9 100644
--- a/build/container/Makefile
+++ b/build/container/Makefile
@@ -143,8 +143,6 @@ test-packaging:
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/x86_64" || echo "Missing centos8/x86_64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/debian10/amd64" || echo "Missing debian10/amd64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/opensuse-leap15.1/x86_64" || echo "Missing opensuse-leap15.1/x86_64"
-	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu16.04/amd64" || echo "Missing ubuntu16.04/amd64"
-	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu16.04/ppc64le" || echo "Missing ubuntu16.04/ppc64le"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/amd64" || echo "Missing ubuntu18.04/amd64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/arm64" || echo "Missing ubuntu18.04/arm64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/ubuntu18.04/ppc64le" || echo "Missing ubuntu18.04/ppc64le"
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh
index 5eb1bdbb..1a753b34 100755
--- a/scripts/build-packages.sh
+++ b/scripts/build-packages.sh
@@ -38,8 +38,6 @@ all=(
     fedora35-aarch64
     fedora35-x86_64
     opensuse-leap15.1-x86_64
-    ubuntu16.04-amd64
-    ubuntu16.04-ppc64le
     ubuntu18.04-amd64
     ubuntu18.04-arm64
     ubuntu18.04-ppc64le
diff --git a/scripts/release-packages.sh b/scripts/release-packages.sh
index 37f2528a..a0877b3a 100755
--- a/scripts/release-packages.sh
+++ b/scripts/release-packages.sh
@@ -167,8 +167,6 @@ all=(
     fedora35-aarch64
     fedora35-x86_64
     opensuse-leap15.1-x86_64
-    ubuntu16.04-amd64
-    ubuntu16.04-ppc64le
     ubuntu18.04-amd64
     ubuntu18.04-arm64
     ubuntu18.04-ppc64le

From 1ef8dc3137a0a1f0955b9e52b90e513939633725 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Mon, 27 Feb 2023 12:30:29 +0200
Subject: [PATCH 3/6] Remove centos7-ppc64le from CI

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 .gitlab-ci.yml              | 9 ---------
 scripts/build-packages.sh   | 1 -
 scripts/release-packages.sh | 1 -
 3 files changed, 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 121eebe7..fad03f49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -116,12 +116,6 @@ package-amazonlinux2-x86_64:
     - .dist-amazonlinux2
     - .arch-x86_64
 
-package-centos7-ppc64le:
-  extends:
-    - .package-build
-    - .dist-centos7
-    - .arch-ppc64le
-
 package-centos7-x86_64:
   extends:
     - .package-build
@@ -210,7 +204,6 @@ image-centos7:
     - .package-artifacts
     - .dist-centos7
   needs:
-    - package-centos7-ppc64le
     - package-centos7-x86_64
 
 image-ubi8:
@@ -260,8 +253,6 @@ image-packaging:
       optional: true
     - job: package-amazonlinux2-x86_64
       optional: true
-    - job: package-centos7-ppc64le
-      optional: true
     - job: package-centos7-x86_64
       optional: true
     - job: package-centos8-ppc64le
diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh
index 1a753b34..f45bb463 100755
--- a/scripts/build-packages.sh
+++ b/scripts/build-packages.sh
@@ -29,7 +29,6 @@ SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/../scripts && pwd )"
 all=(
     amazonlinux2-aarch64
     amazonlinux2-x86_64
-    centos7-ppc64le
     centos7-x86_64
     centos8-aarch64
     centos8-ppc64le
diff --git a/scripts/release-packages.sh b/scripts/release-packages.sh
index a0877b3a..71e83293 100755
--- a/scripts/release-packages.sh
+++ b/scripts/release-packages.sh
@@ -158,7 +158,6 @@ function sync() {
 all=(
     amazonlinux2-aarch64
     amazonlinux2-x86_64
-    centos7-ppc64le
     centos7-x86_64
     centos8-aarch64
     centos8-ppc64le

From 81abc92743b9b58b7cee846e5e5c9eafc878411a Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Mon, 27 Feb 2023 12:31:38 +0200
Subject: [PATCH 4/6] Remove fedora35 from 'all' targets

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 scripts/build-packages.sh   | 2 --
 scripts/release-packages.sh | 2 --
 2 files changed, 4 deletions(-)

diff --git a/scripts/build-packages.sh b/scripts/build-packages.sh
index f45bb463..06f8ba0a 100755
--- a/scripts/build-packages.sh
+++ b/scripts/build-packages.sh
@@ -34,8 +34,6 @@ all=(
     centos8-ppc64le
     centos8-x86_64
     debian10-amd64
-    fedora35-aarch64
-    fedora35-x86_64
     opensuse-leap15.1-x86_64
     ubuntu18.04-amd64
     ubuntu18.04-arm64
diff --git a/scripts/release-packages.sh b/scripts/release-packages.sh
index 71e83293..c82e6a5f 100755
--- a/scripts/release-packages.sh
+++ b/scripts/release-packages.sh
@@ -163,8 +163,6 @@ all=(
     centos8-ppc64le
     centos8-x86_64
     debian10-amd64
-    fedora35-aarch64
-    fedora35-x86_64
     opensuse-leap15.1-x86_64
     ubuntu18.04-amd64
     ubuntu18.04-arm64

From 3497936cdfefde8b38aca2b7b6d60947a1071bc0 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Mon, 27 Feb 2023 12:49:47 +0200
Subject: [PATCH 5/6] Remove ubuntu18.04 toolkit-container image

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 .common-ci.yml           | 17 ++++-------------
 .gitlab-ci.yml           | 38 ++++++++++++++------------------------
 .nvidia-ci.yml           | 16 +++-------------
 build/container/Makefile |  2 +-
 4 files changed, 22 insertions(+), 51 deletions(-)

diff --git a/.common-ci.yml b/.common-ci.yml
index 569b5d05..fb2ff90d 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -92,8 +92,6 @@ stages:
     PACKAGE_REPO_TYPE: debian
 
 .dist-ubuntu20.04:
-  rules:
-    - !reference [.main-or-manual, rules]
   variables:
     DIST: ubuntu20.04
     CVE_UPDATES: "libsasl2-2 libsasl2-modules-db"
@@ -238,22 +236,15 @@ release:staging-ubi8:
   needs:
     - image-ubi8
 
-release:staging-ubuntu18.04:
-  extends:
-    - .release:staging
-    - .dist-ubuntu18.04
-  needs:
-    - test-toolkit-ubuntu18.04
-    - test-containerd-ubuntu18.04
-    - test-crio-ubuntu18.04
-    - test-docker-ubuntu18.04
-
 release:staging-ubuntu20.04:
   extends:
     - .release:staging
     - .dist-ubuntu20.04
   needs:
-    - image-ubuntu20.04
+    - test-toolkit-ubuntu20.04
+    - test-containerd-ubuntu20.04
+    - test-crio-ubuntu20.04
+    - test-docker-ubuntu20.04
 
 release:staging-packaging:
   extends:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fad03f49..7a338002 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -217,17 +217,6 @@ image-ubi8:
     - package-centos8-x86_64
     - package-centos8-ppc64le
 
-image-ubuntu18.04:
-  extends:
-    - .image-build
-    - .package-artifacts
-    - .dist-ubuntu18.04
-  needs:
-    - package-ubuntu18.04-amd64
-    - package-ubuntu18.04-arm64
-    - job: package-ubuntu18.04-ppc64le
-      optional: true
-
 image-ubuntu20.04:
   extends:
     - .image-build
@@ -236,7 +225,8 @@ image-ubuntu20.04:
   needs:
     - package-ubuntu18.04-amd64
     - package-ubuntu18.04-arm64
-    - package-ubuntu18.04-ppc64le
+    - job: package-ubuntu18.04-ppc64le
+      optional: true
 
 # The DIST=packaging target creates an image containing all built packages
 image-packaging:
@@ -294,31 +284,31 @@ image-packaging:
     TEST_CASES: "crio"
 
 # Define the test targets
-test-toolkit-ubuntu18.04:
+test-toolkit-ubuntu20.04:
   extends:
     - .test:toolkit
-    - .dist-ubuntu18.04
+    - .dist-ubuntu20.04
   needs:
-    - image-ubuntu18.04
+    - image-ubuntu20.04
 
-test-containerd-ubuntu18.04:
+test-containerd-ubuntu20.04:
   extends:
     - .test:containerd
-    - .dist-ubuntu18.04
+    - .dist-ubuntu20.04
   needs:
-    - image-ubuntu18.04
+    - image-ubuntu20.04
 
-test-crio-ubuntu18.04:
+test-crio-ubuntu20.04:
   extends:
     - .test:crio
-    - .dist-ubuntu18.04
+    - .dist-ubuntu20.04
   needs:
-    - image-ubuntu18.04
+    - image-ubuntu20.04
 
-test-docker-ubuntu18.04:
+test-docker-ubuntu20.04:
   extends:
     - .test:docker
-    - .dist-ubuntu18.04
+    - .dist-ubuntu20.04
   needs:
-    - image-ubuntu18.04
+    - image-ubuntu20.04
 
diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml
index 1a82598a..51b3a58a 100644
--- a/.nvidia-ci.yml
+++ b/.nvidia-ci.yml
@@ -79,11 +79,6 @@ image-ubi8:
     - .dist-ubi8
     - .image-pull
 
-image-ubuntu18.04:
-  extends:
-    - .dist-ubuntu18.04
-    - .image-pull
-
 image-ubuntu20.04:
   extends:
     - .dist-ubuntu20.04
@@ -230,12 +225,12 @@ release:packages:kitmaker:
   extends:
     - .release:packages
 
-release:staging-ubuntu18.04:
+release:staging-ubuntu20.04:
   extends:
     - .release:staging
-    - .dist-ubuntu18.04
+    - .dist-ubuntu20.04
   needs:
-    - image-ubuntu18.04
+    - image-ubuntu20.04
 
 # Define the external release targets
 # Release to NGC
@@ -244,11 +239,6 @@ release:ngc-centos7:
     - .dist-centos7
     - .release:ngc
 
-release:ngc-ubuntu18.04:
-  extends:
-    - .dist-ubuntu18.04
-    - .release:ngc
-
 release:ngc-ubuntu20.04:
   extends:
     - .dist-ubuntu20.04
diff --git a/build/container/Makefile b/build/container/Makefile
index 522b51f9..c0adc331 100644
--- a/build/container/Makefile
+++ b/build/container/Makefile
@@ -44,7 +44,7 @@ OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
 
 ##### Public rules #####
 DEFAULT_PUSH_TARGET := ubuntu20.04
-DISTRIBUTIONS := ubuntu20.04 ubuntu18.04 ubi8 centos7
+DISTRIBUTIONS := ubuntu20.04 ubi8 centos7
 
 META_TARGETS := packaging
 

From 36c4174de3416e58fa8c56b08e4b0dfd07fa9778 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Mon, 27 Feb 2023 13:45:44 +0200
Subject: [PATCH 6/6] Update libnvidia-container

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 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 dd3781ca..abf9758e 160000
--- a/third_party/libnvidia-container
+++ b/third_party/libnvidia-container
@@ -1 +1 @@
-Subproject commit dd3781caadf9260e4893277cfa7fcba1a5d10eef
+Subproject commit abf9758ec8d98118119892441614270336c3257c