From 47bc4f90badb29fa152097aca76e1f4bb7e142b1 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Fri, 14 Jan 2022 14:06:46 +0100
Subject: [PATCH] Remove support for amazonlinux1

This commit removes support for building amazonlinux1 packages.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 .common-ci.yml                                    | 4 ----
 .gitlab-ci.yml                                    | 7 -------
 build/container/Makefile                          | 1 -
 docker/docker.mk                                  | 2 +-
 packaging/debian/changelog                        | 2 ++
 packaging/rpm/SPECS/nvidia-container-toolkit.spec | 1 +
 scripts/release.sh                                | 1 -
 7 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.common-ci.yml b/.common-ci.yml
index dcb90282..33e61894 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -35,10 +35,6 @@ stages:
   - build-all
 
 # Define the distribution targets
-.dist-amazonlinux1:
-  variables:
-    DIST: amazonlinux1
-
 .dist-amazonlinux2:
   variables:
     DIST: amazonlinux2
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f716cae0..da446359 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,12 +103,6 @@ unit-tests:
       - ${ARTIFACTS_ROOT}
 
 # Define the package build targets
-package-amazonlinux1-x86_64:
-  extends:
-    - .package-build
-    - .dist-amazonlinux1
-    - .arch-x86_64
-
 package-amazonlinux2-aarch64:
   extends:
     - .package-build
@@ -259,7 +253,6 @@ image-packaging:
     - .package-artifacts
     - .dist-packaging
   needs:
-    - package-amazonlinux1-x86_64
     - package-amazonlinux2-aarch64
     - package-amazonlinux2-x86_64
     - package-centos7-ppc64le
diff --git a/build/container/Makefile b/build/container/Makefile
index 100c22c1..3bda4970 100644
--- a/build/container/Makefile
+++ b/build/container/Makefile
@@ -119,7 +119,6 @@ $(TEST_TARGETS): test-%:
 test-packaging: DIST = packaging
 test-packaging:
 	@echo "Testing package image contents"
-	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/amazonlinux1/x86_64" || echo "Missing amazonlinux1/x86_64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/amazonlinux2/aarch64" || echo "Missing amazonlinux2/aarch64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/amazonlinux2/x86_64" || echo "Missing amazonlinux2/x86_64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/ppc64le" || echo "Missing centos7/ppc64le"
diff --git a/docker/docker.mk b/docker/docker.mk
index 085e36da..3a33034c 100644
--- a/docker/docker.mk
+++ b/docker/docker.mk
@@ -14,7 +14,7 @@
 
 # Supported OSs by architecture
 AMD64_TARGETS := ubuntu20.04 ubuntu18.04 ubuntu16.04 debian10 debian9
-X86_64_TARGETS := centos7 centos8 rhel7 rhel8 amazonlinux1 amazonlinux2 opensuse-leap15.1
+X86_64_TARGETS := centos7 centos8 rhel7 rhel8 amazonlinux2 opensuse-leap15.1
 PPC64LE_TARGETS := ubuntu18.04 ubuntu16.04 centos7 centos8 rhel7 rhel8
 ARM64_TARGETS := ubuntu20.04 ubuntu18.04
 AARCH64_TARGETS := centos8 rhel8 amazonlinux2
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index c488f612..eb0699f3 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -1,5 +1,7 @@
 nvidia-container-toolkit (1.8.0~rc.2-1) UNRELEASED; urgency=medium
 
+  * Remove support for building amazonlinux1 packages
+
  -- NVIDIA CORPORATION <cudatools@nvidia.com> Thu, 20 Jan 2022 13:38:48 +0100
 
 nvidia-container-toolkit (1.8.0~rc.1-1) UNRELEASED; urgency=medium
diff --git a/packaging/rpm/SPECS/nvidia-container-toolkit.spec b/packaging/rpm/SPECS/nvidia-container-toolkit.spec
index 04c48731..27b00c52 100644
--- a/packaging/rpm/SPECS/nvidia-container-toolkit.spec
+++ b/packaging/rpm/SPECS/nvidia-container-toolkit.spec
@@ -65,6 +65,7 @@ rm -f %{_bindir}/nvidia-container-runtime-hook
 
 %changelog
 * Thu Jan 20 2022 NVIDIA CORPORATION <cudatools@nvidia.com> 1.8.0-0.1.rc.2
+- Remove support for building amazonlinux1 packages
 
 * Wed Dec 08 2021 NVIDIA CORPORATION <cudatools@nvidia.com> 1.8.0-0.1.rc.1
 - [libnvidia-container] Add support for cgroupv2
diff --git a/scripts/release.sh b/scripts/release.sh
index 34ae8570..a7c9f131 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -28,7 +28,6 @@ PROJECT_ROOT="$( cd ${SCRIPTS_DIR}/.. && pwd )"
 # to the relevant repositories. This targets forwarded to the build-all-components script
 # can be overridden by specifying command line arguments.
 all=(
-    amazonlinux1-x86_64
     amazonlinux2-aarch64
     amazonlinux2-x86_64
     centos7-ppc64le