From 0a57cdc6e817713c5ce49748cd8d251e656d2f7e Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Tue, 9 May 2023 17:17:56 +0200
Subject: [PATCH] Remove redundant packaging targets from CI

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 .common-ci.yml           | 21 ---------------------
 .gitlab-ci.yml           | 24 ------------------------
 build/container/Makefile |  4 ----
 3 files changed, 49 deletions(-)

diff --git a/.common-ci.yml b/.common-ci.yml
index 2b754154..72ebf5ef 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -74,13 +74,6 @@ trigger-pipeline:
     - when: always
 
 # Define the distribution targets
-.dist-amazonlinux2:
-  rules:
-    - !reference [.main-or-manual, rules]
-  variables:
-    DIST: amazonlinux2
-    PACKAGE_REPO_TYPE: rpm
-
 .dist-centos7:
   rules:
     - !reference [.main-or-manual, rules]
@@ -95,20 +88,6 @@ trigger-pipeline:
     CVE_UPDATES: "cyrus-sasl-lib"
     PACKAGE_REPO_TYPE: rpm
 
-.dist-debian10:
-  rules:
-    - !reference [.main-or-manual, rules]
-  variables:
-    DIST: debian10
-    PACKAGE_REPO_TYPE: debian
-
-.dist-opensuse-leap15.1:
-  rules:
-    - !reference [.main-or-manual, rules]
-  variables:
-    DIST: opensuse-leap15.1
-    PACKAGE_REPO_TYPE: rpm
-
 .dist-ubi8:
   rules:
     - !reference [.main-or-manual, rules]
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e606398..1c84955e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -126,18 +126,6 @@ package-meta-packages:
     paths:
       - ${ARTIFACTS_ROOT}
 
-package-amazonlinux2-aarch64:
-  extends:
-    - .package-build
-    - .dist-amazonlinux2
-    - .arch-aarch64
-
-package-amazonlinux2-x86_64:
-  extends:
-    - .package-build
-    - .dist-amazonlinux2
-    - .arch-x86_64
-
 package-centos7-x86_64:
   extends:
     - .package-build
@@ -162,18 +150,6 @@ package-centos8-x86_64:
     - .dist-centos8
     - .arch-x86_64
 
-package-debian10-amd64:
-  extends:
-    - .package-build
-    - .dist-debian10
-    - .arch-amd64
-
-package-opensuse-leap15.1-x86_64:
-  extends:
-    - .package-build
-    - .dist-opensuse-leap15.1
-    - .arch-x86_64
-
 package-ubuntu18.04-amd64:
   extends:
     - .package-build
diff --git a/build/container/Makefile b/build/container/Makefile
index 64d99806..71d38329 100644
--- a/build/container/Makefile
+++ b/build/container/Makefile
@@ -144,15 +144,11 @@ $(TEST_TARGETS): test-%:
 test-packaging: DIST = packaging
 test-packaging:
 	@echo "Testing package image contents"
-	@$(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"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos7/x86_64" || echo "Missing centos7/x86_64"
 	@$(DOCKER) run --rm $(IMAGE) test -d "/artifacts/packages/centos8/aarch64" || echo "Missing centos8/aarch64"
 	@$(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/opensuse-leap15.1/x86_64" || echo "Missing opensuse-leap15.1/x86_64"
 	@$(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"